2011-06-03 Alexis Menard <alexis.menard@openbossa.org>

        Reviewed by Benjamin Poulain.

        [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
        https://bugs.webkit.org/show_bug.cgi?id=61957

        When building inside the Qt source tree, qmake always append the mkspecs
        defines after ours. We have to workaround and make sure that we append
        our flags after the qmake variable used inside Qt. This workaround was provided
        by our qmake folks. We need to append in both case because qmake behave differently
        when called with -spec or via SUBDIR+=.

        * Source/WebKit.pri:
2011-06-03  Alexis Menard  <alexis.menard@openbossa.org>

        Reviewed by Benjamin Poulain.

        [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
        https://bugs.webkit.org/show_bug.cgi?id=61957

        When building inside the Qt source tree, qmake always append the mkspecs
        defines after ours. We have to workaround and make sure that we append
        our flags after the qmake variable used inside Qt. This workaround was provided
        by our qmake folks. We need to append in both case because qmake behave differently
        when called with -spec or via SUBDIR+=. This patch unbreak r87950 on Mac for Qt port.

        * JavaScriptCore.pro:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@88006 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 8afe6b3..8ef49ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-06-03  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
+        https://bugs.webkit.org/show_bug.cgi?id=61957
+
+        When building inside the Qt source tree, qmake always append the mkspecs
+        defines after ours. We have to workaround and make sure that we append
+        our flags after the qmake variable used inside Qt. This workaround was provided
+        by our qmake folks. We need to append in both case because qmake behave differently
+        when called with -spec or via SUBDIR+=.
+
+        * Source/WebKit.pri:
+
 2011-06-02  Alexis Menard  <alexis.menard@openbossa.org>
 
         Reviewed by Andreas Kling.

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 8ec5057..29063f5 100755 (executable)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-06-03  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
+        https://bugs.webkit.org/show_bug.cgi?id=61957
+
+        When building inside the Qt source tree, qmake always append the mkspecs
+        defines after ours. We have to workaround and make sure that we append 
+        our flags after the qmake variable used inside Qt. This workaround was provided 
+        by our qmake folks. We need to append in both case because qmake behave differently
+        when called with -spec or via SUBDIR+=. This patch unbreak r87950 on Mac for Qt port.
+
+        * JavaScriptCore.pro:
+
 2011-06-02  Jay Civelli  <jcivelli@chromium.org>
 
         Reviewed by Adam Barth.

diff --git a/Source/JavaScriptCore/JavaScriptCore.pro b/Source/JavaScriptCore/JavaScriptCore.pro
index a0e5d97..836a0bc 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.pro
+++ b/Source/JavaScriptCore/JavaScriptCore.pro
@@ -213,16 +213,21 @@ symbian: {
     QMAKE_CXXFLAGS.ARMCC += -OTime -O3
 }
 
-lessThan(QT_GCC_MAJOR_VERSION, 5):lessThan(QT_GCC_MINOR_VERSION, 6) {
-    # Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec.
-    *-g++* {
-        CONFIG(QTDIR_build) {
-            QMAKE_CFLAGS_WARN_ON = -Wno-c++0x-compat
-            QMAKE_CXXFLAGS_WARN_ON = -Wno-c++0x-compat
-        } else {
+lessThan(QT_GCC_MAJOR_VERSION, 5) {
+    # GCC 4.5 and before
+    lessThan(QT_GCC_MINOR_VERSION, 6) {
+        # Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec.
+        *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
+    }
+
+    # GCC 4.6 and after.
+    greaterThan(QT_GCC_MINOR_VERSION, 5) {
+        if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
+            # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
+            QMAKE_CFLAGS_WARN_ON += -Wno-c++0x-compat
+            QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat
             QMAKE_CFLAGS += -Wno-c++0x-compat
             QMAKE_CXXFLAGS += -Wno-c++0x-compat
         }
     }
 }
-

diff --git a/Source/WebKit.pri b/Source/WebKit.pri
index 1f8ac3e..127b6ee 100644 (file)
--- a/Source/WebKit.pri
+++ b/Source/WebKit.pri
@@ -97,13 +97,10 @@ linux-g++* {
     greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
         if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
             # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
-            CONFIG(QTDIR_build) {
-                QMAKE_CFLAGS_WARN_ON = -Wno-c++0x-compat
-                QMAKE_CXXFLAGS_WARN_ON = -Wno-c++0x-compat
-            } else {
-                QMAKE_CFLAGS += -Wno-c++0x-compat
-                QMAKE_CXXFLAGS += -Wno-c++0x-compat
-            }
+            QMAKE_CFLAGS_WARN_ON += -Wno-c++0x-compat
+            QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat
+            QMAKE_CFLAGS += -Wno-c++0x-compat
+            QMAKE_CXXFLAGS += -Wno-c++0x-compat
         }
     }
 }