[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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@95163 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 1d8f49c..03e1a84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+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>
 
         [v8] Improve performance of typed array copy constructor taking Array

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 2e4b5cb..f263dc2 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+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>
 
         Unreviewed, rolling out r95145.

diff --git a/Source/JavaScriptCore/JavaScriptCore.pro b/Source/JavaScriptCore/JavaScriptCore.pro
index 4ea2981..f6a9fbe 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.pro
+++ b/Source/JavaScriptCore/JavaScriptCore.pro
@@ -33,7 +33,7 @@ CONFIG(QTDIR_build) {
 
 # 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
     }
@@ -216,15 +216,15 @@ symbian: {
     QMAKE_CXXFLAGS.ARMCC += -OTime -O3
 }
 
-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
     }
 
     # 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).
             QMAKE_CFLAGS_WARN_ON += -Wno-c++0x-compat

diff --git a/Source/WebKit.pri b/Source/WebKit.pri
index 7fc8827..dadae6c 100644 (file)
--- a/Source/WebKit.pri
+++ b/Source/WebKit.pri
@@ -95,8 +95,11 @@ CONFIG -= warn_on
 # Treat warnings as errors on x86/Linux/GCC
 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).
             QMAKE_CFLAGS_WARN_ON += -Wno-c++0x-compat