Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
  Re-apply change e3208a8d44423bc3b5c32e2e90f68675e51a3b73 by Andreas Kling
  Re-apply change 37cde52cb17b57f8ec89c248f06331ed4977e51c by Ademar de Souza Reis Jr
  Re-apply change 945c44d0865cf44363e6c860995f971ce952dd5f by Ademar de Souza Reis Jr
  Updated WebKit to 52a11cec052aa40d3bbc06861be1177b649b4a99

4 files changed, 28 insertions, 6 deletions

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index a5f6423..12a28b8 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-99371ddc1d61832131835964a753e1c5817f6916
+52a11cec052aa40d3bbc06861be1177b649b4a99
diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog
index a661d6a..bbaf26d 100644
--- a/src/3rdparty/webkit/ChangeLog
+++ b/src/3rdparty/webkit/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/src/3rdparty/webkit/Source/WebKit.pri b/src/3rdparty/webkit/Source/WebKit.pri
index bc889d1..c469d1a 100644
--- a/src/3rdparty/webkit/Source/WebKit.pri
+++ b/src/3rdparty/webkit/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) {
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 19f5536..750e7e7 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
 
 and has the sha1 checksum
 
-        99371ddc1d61832131835964a753e1c5817f6916
+        52a11cec052aa40d3bbc06861be1177b649b4a99