Changeset 95163 in webkit

Timestamp:

Sep 14, 2011 9:33:16 PM (13 years ago)

Author:

alexis.menard@openbossa.org

Message:

[Qt] Replace QT_GCC_X as they don't exist in Qt5 anymore.
​https://bugs.webkit.org/show_bug.cgi?id=68114

Reviewed by Kenneth Rohde Christiansen.

.:

Replace QT_GCC_X variables, they have been removed in Qt5. It was
actually wrong to use them because they tell about which GCC version
Qt has been compiled, not the current version of GCC use to build webkit.
I use gcc -dumpversion to get it.

• Source/WebKit.pri:

Source/JavaScriptCore:

Use the new GCC_X variables defined in WebKit.pri to replace
the usage of QT_GCC_X.

• JavaScriptCore.pro:

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2011-09-14  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt] Replace QT_GCC_X as they don't exist in Qt5 anymore.
+        https://bugs.webkit.org/show_bug.cgi?id=68114
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Replace QT_GCC_X variables, they have been removed in Qt5. It was
+        actually wrong to use them because they tell about which GCC version
+        Qt has been compiled, not the current version of GCC use to build webkit.
+        I use gcc -dumpversion to get it.
+
+        * Source/WebKit.pri:
+
 2011-09-14  Ulan Degenbaev  <ulan@chromium.org>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-14  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt] Replace QT_GCC_X as they don't exist in Qt5 anymore.
+        https://bugs.webkit.org/show_bug.cgi?id=68114
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Use the new GCC_X variables defined in WebKit.pri to replace
+        the usage of QT_GCC_X.
+
+        * JavaScriptCore.pro:
+
 2011-09-14  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.pro

@@ -34 +34 @@
 # Rules when JIT enabled (not disabled)
 !contains(DEFINES, ENABLE_JIT=0) {
-    linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
+    linux*-g++*:greaterThan(GCC_MAJOR_VERSION,3):greaterThan(GCC_MINOR_VERSION,0) {
         QMAKE_CXXFLAGS += -fno-stack-protector
         QMAKE_CFLAGS += -fno-stack-protector
@@ -217 +217 @@
 }
 
-lessThan(QT_GCC_MAJOR_VERSION, 5) {
+lessThan(GCC_MAJOR_VERSION, 5) {
     # GCC 4.5 and before
-    lessThan(QT_GCC_MINOR_VERSION, 6) {
+    lessThan(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
@@ -225 +225 @@
 
     # GCC 4.6 and after.
-    greaterThan(QT_GCC_MINOR_VERSION, 5) {
+    greaterThan(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).

trunk/Source/WebKit.pri

@@ -96 +96 @@
 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) {
+    GCC_VERSION = $$system(gcc -dumpversion)
+    GCC_VERSION = $$split(GCC_VERSION, ".")
+    GCC_MAJOR_VERSION = $$first(GCC_VERSION)
+    GCC_MINOR_VERSION = $$member(GCC_VERSION, 1)
+    greaterThan(GCC_MAJOR_VERSION, 3):greaterThan(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).