Changeset 121338 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Jun 27, 2012, 6:02:03 AM (13 years ago)

Author:

[email protected]

Message:

[Qt] Remove redundant c++11 warning suppression code

This is already handled in default_post.

Patch by Oswald Buddenhagen <​[email protected]> on 2012-06-27
Reviewed by Tor Arne Vestbø.

• Target.pri:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• Target.pri (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-06-27  Oswald Buddenhagen  <[email protected]>
+
+        [Qt] Remove redundant c++11 warning suppression code
+
+        This is already handled in default_post.
+
+        Reviewed by Tor Arne Vestbø.
+
+        * Target.pri:
+
 2012-06-26  Tor Arne Vestbø  <[email protected]>
 

trunk/Source/JavaScriptCore/Target.pri

@@ -262 +262 @@
         *-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
-        }
-    }
-}
+}