gistfile1.txt

diff --git a/ChangeLog b/ChangeLog
index a661d6a..bbaf26d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2011-11-09  Zeno Albisser  <zeno.albisser@nokia.com>
+
+        [Qt] Unreviewed: Fix build on Mac.
+        https://bugreports.qt.nokia.com/browse/QTBUG-20619
+
+        This bug was introduced by the previous commit
+        for the same bugreport.
+
+        * Source/WebKit.pri:
+
+2011-11-09  Zeno Albisser  <zeno.albisser@nokia.com>
+
+        [Qt] Unreviewed: Fix debug_and_release build on Windows.
+        https://bugreports.qt.nokia.com/browse/QTBUG-20619
+
+        This bug was introduced by the previous commit
+        for the same bugreport.
+
+        * Source/WebKit.pri:
+
 2011-11-03  Zeno Albisser  <zeno.albisser@nokia.com>
 
         [Qt] Unreviewed: Fix universal binary build on Mac.
diff --git a/Source/WebKit.pri b/Source/WebKit.pri
index bc889d1..c469d1a 100644
--- a/Source/WebKit.pri
+++ b/Source/WebKit.pri
@@ -12,10 +12,12 @@ CONFIG(QTDIR_build) {
     win32|mac:!macx-xcode:CONFIG += debug_and_release
     # In case we are building a universal binary for Qt, building debug is not
     # possible because we would exceed the maximum library size for 32bit.
-    mac:CONFIG(QT_CONFIG, x86):CONFIG(QT_CONFIG, x86_64):debug|debug_and_release {
-        message(Building a universal binary with debug symbols is not possible. Building release!)
-        CONFIG -= debug_and_release debug
-        CONFIG += release
+    mac:contains(QT_CONFIG, x86):contains(QT_CONFIG, x86_64) {
+        CONFIG(debug_and_release)|CONFIG(debug, debug|release) {
+            message(Building a universal binary with debug symbols is not possible. Building release!)
+            CONFIG -= debug_and_release debug
+            CONFIG += release
+        }
     }
 } else {
     !CONFIG(release, debug|release) {