Changeset 85855 in webkit

Timestamp:

May 5, 2011 8:44:42 AM (13 years ago)

Author:

alexis.menard@openbossa.org

Message:

2011-05-05 Alexis Menard <​alexis.menard@openbossa.org>

Reviewed by Benjamin Poulain.

[Qt] Make QtWebKit build when using gcc 4.6.0
​https://bugs.webkit.org/show_bug.cgi?id=60265

If QtWebKit is compiled with gcc 4.6.0 and the build is not done
with c++0x support we need to deactivate warnings about compatibility.
Some WebKit types have names which conflicts with upcoming c++0x
types. If QtWebKit is built with c++0x support, WebKit has code to
fallback to the standard type rather than the WebKit implementation.
For example nullptr will be the one of the std if build options turns on
c++0x support.

• Source/WebKit.pri:

2011-05-05 Alexis Menard <​alexis.menard@openbossa.org>

Reviewed by Benjamin Poulain.

[Qt] Make QtWebKit build when using gcc 4.6.0
​https://bugs.webkit.org/show_bug.cgi?id=60265

If QtWebKit is compiled with gcc 4.6.0 or later we don't want to deactivate
the c++0x support because it works.

• JavaScriptCore.pro:

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2011-05-05  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] Make QtWebKit build when using gcc 4.6.0
+        https://bugs.webkit.org/show_bug.cgi?id=60265
+
+        If QtWebKit is compiled with gcc 4.6.0 and the build is not done
+        with c++0x support we need to deactivate warnings about compatibility.
+        Some WebKit types have names which conflicts with upcoming c++0x
+        types. If QtWebKit is built with c++0x support, WebKit has code to
+        fallback to the standard type rather than the WebKit implementation.
+        For example nullptr will be the one of the std if build options turns on
+        c++0x support.
+
+        * Source/WebKit.pri:
+
 2011-05-04  Xan Lopez  <xlopez@igalia.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-05-05  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] Make QtWebKit build when using gcc 4.6.0
+        https://bugs.webkit.org/show_bug.cgi?id=60265
+
+        If QtWebKit is compiled with gcc 4.6.0 or later we don't want to deactivate
+        the c++0x support because it works.
+
+        * JavaScriptCore.pro:
+
 2011-05-04  Fridrich Strba  <fridrich.strba@bluewin.ch>
 

trunk/Source/JavaScriptCore/JavaScriptCore.pro

@@ -218 +218 @@
 }
 
-# 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
-
+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++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
+}
+

trunk/Source/WebKit.pri

@@ -94 +94 @@
 linux-g++* {
     isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
+
+    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).
+            QMAKE_CFLAGS += -Wno-c++0x-compat
+            QMAKE_CXXFLAGS += -Wno-c++0x-compat
+        }
+    }
 }