Title: [95212] trunk
- Revision
- 95212
- Author
- commit-qu...@webkit.org
- Date
- 2011-09-15 12:24:56 -0700 (Thu, 15 Sep 2011)
Log Message
Unreviewed, rolling out r95163.
http://trac.webkit.org/changeset/95163
https://bugs.webkit.org/show_bug.cgi?id=68180
[Qt] The QT_GCC_X variables were removed in Qt5 by accident.
(Requested by darktears on #webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2011-09-15
.:
* Source/WebKit.pri:
Source/_javascript_Core:
* _javascript_Core.pro:
Modified Paths
Diff
Modified: trunk/ChangeLog (95211 => 95212)
--- trunk/ChangeLog 2011-09-15 19:20:00 UTC (rev 95211)
+++ trunk/ChangeLog 2011-09-15 19:24:56 UTC (rev 95212)
@@ -1,3 +1,14 @@
+2011-09-15 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r95163.
+ http://trac.webkit.org/changeset/95163
+ https://bugs.webkit.org/show_bug.cgi?id=68180
+
+ [Qt] The QT_GCC_X variables were removed in Qt5 by accident.
+ (Requested by darktears on #webkit).
+
+ * Source/WebKit.pri:
+
2011-09-14 Alexis Menard <alexis.men...@openbossa.org>
[Qt] Replace QT_GCC_X as they don't exist in Qt5 anymore.
Modified: trunk/Source/_javascript_Core/ChangeLog (95211 => 95212)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-15 19:20:00 UTC (rev 95211)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-15 19:24:56 UTC (rev 95212)
@@ -1,3 +1,14 @@
+2011-09-15 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r95163.
+ http://trac.webkit.org/changeset/95163
+ https://bugs.webkit.org/show_bug.cgi?id=68180
+
+ [Qt] The QT_GCC_X variables were removed in Qt5 by accident.
+ (Requested by darktears on #webkit).
+
+ * _javascript_Core.pro:
+
2011-09-15 Gavin Barraclough <barraclo...@apple.com>
Windows build fix p1.
Modified: trunk/Source/_javascript_Core/_javascript_Core.pro (95211 => 95212)
--- trunk/Source/_javascript_Core/_javascript_Core.pro 2011-09-15 19:20:00 UTC (rev 95211)
+++ trunk/Source/_javascript_Core/_javascript_Core.pro 2011-09-15 19:24:56 UTC (rev 95212)
@@ -33,7 +33,7 @@
# Rules when JIT enabled (not disabled)
!contains(DEFINES, ENABLE_JIT=0) {
- linux*-g++*:greaterThan(GCC_MAJOR_VERSION,3):greaterThan(GCC_MINOR_VERSION,0) {
+ linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
QMAKE_CXXFLAGS += -fno-stack-protector
QMAKE_CFLAGS += -fno-stack-protector
}
@@ -216,15 +216,15 @@
QMAKE_CXXFLAGS.ARMCC += -OTime -O3
}
-lessThan(GCC_MAJOR_VERSION, 5) {
+lessThan(QT_GCC_MAJOR_VERSION, 5) {
# GCC 4.5 and before
- lessThan(GCC_MINOR_VERSION, 6) {
+ lessThan(QT_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(GCC_MINOR_VERSION, 5) {
+ 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
Modified: trunk/Source/WebKit.pri (95211 => 95212)
--- trunk/Source/WebKit.pri 2011-09-15 19:20:00 UTC (rev 95211)
+++ trunk/Source/WebKit.pri 2011-09-15 19:24:56 UTC (rev 95212)
@@ -95,11 +95,8 @@
# Treat warnings as errors on x86/Linux/GCC
linux-g++* {
isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
- 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) {
+
+ greaterThan(QT_GCC_MAJOR_VERSION, 3):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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
