Title: [95163] trunk
- Revision
- 95163
- Author
- alexis.men...@openbossa.org
- Date
- 2011-09-14 21:33:16 -0700 (Wed, 14 Sep 2011)
Log 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/_javascript_Core:
Use the new GCC_X variables defined in WebKit.pri to replace
the usage of QT_GCC_X.
* _javascript_Core.pro:
Modified Paths
Diff
Modified: trunk/ChangeLog (95162 => 95163)
--- trunk/ChangeLog 2011-09-15 04:27:17 UTC (rev 95162)
+++ trunk/ChangeLog 2011-09-15 04:33:16 UTC (rev 95163)
@@ -1,3 +1,17 @@
+2011-09-14 Alexis Menard <alexis.men...@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 <u...@chromium.org>
[v8] Improve performance of typed array copy constructor taking Array
Modified: trunk/Source/_javascript_Core/ChangeLog (95162 => 95163)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-15 04:27:17 UTC (rev 95162)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-15 04:33:16 UTC (rev 95163)
@@ -1,3 +1,15 @@
+2011-09-14 Alexis Menard <alexis.men...@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.
+
+ * _javascript_Core.pro:
+
2011-09-14 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r95145.
Modified: trunk/Source/_javascript_Core/_javascript_Core.pro (95162 => 95163)
--- trunk/Source/_javascript_Core/_javascript_Core.pro 2011-09-15 04:27:17 UTC (rev 95162)
+++ trunk/Source/_javascript_Core/_javascript_Core.pro 2011-09-15 04:33:16 UTC (rev 95163)
@@ -33,7 +33,7 @@
# 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 @@
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
Modified: trunk/Source/WebKit.pri (95162 => 95163)
--- trunk/Source/WebKit.pri 2011-09-15 04:27:17 UTC (rev 95162)
+++ trunk/Source/WebKit.pri 2011-09-15 04:33:16 UTC (rev 95163)
@@ -95,8 +95,11 @@
# 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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
