Title: [121338] trunk/Source/_javascript_Core
Revision
121338
Author
ves...@webkit.org
Date
2012-06-27 06:02:03 -0700 (Wed, 27 Jun 2012)

Log Message

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

This is already handled in default_post.

Patch by Oswald Buddenhagen <oswald.buddenha...@nokia.com> on 2012-06-27
Reviewed by Tor Arne Vestbø.

* Target.pri:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (121337 => 121338)


--- trunk/Source/_javascript_Core/ChangeLog	2012-06-27 11:35:06 UTC (rev 121337)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-06-27 13:02:03 UTC (rev 121338)
@@ -1,3 +1,13 @@
+2012-06-27  Oswald Buddenhagen  <oswald.buddenha...@nokia.com>
+
+        [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ø  <tor.arne.ves...@nokia.com>
 
         [Qt] Add missing heades to HEADERS

Modified: trunk/Source/_javascript_Core/Target.pri (121337 => 121338)


--- trunk/Source/_javascript_Core/Target.pri	2012-06-27 11:35:06 UTC (rev 121337)
+++ trunk/Source/_javascript_Core/Target.pri	2012-06-27 13:02:03 UTC (rev 121338)
@@ -261,15 +261,4 @@
         # 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
-        }
-    }
 }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to