Changeset 88006 in webkit

Timestamp:

Jun 3, 2011 5:04:22 AM (13 years ago)

Author:

alexis.menard@openbossa.org

Message:

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:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/JavaScriptCore.pro (modified) (2 diffs)
• Source/WebKit.pri (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/JavaScriptCore/JavaScriptCore.pro

@@ -214 +214 @@
 }
 
-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
@@ -226 +232 @@
     }
 }
-

trunk/Source/WebKit.pri

@@ -98 +98 @@
         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
         }
     }