Title: [87950] trunk
- Revision
- 87950
- Author
- [email protected]
- Date
- 2011-06-02 13:37:58 -0700 (Thu, 02 Jun 2011)
Log Message
2011-06-02 Alexis Menard <[email protected]>
Reviewed by Andreas Kling.
[Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
https://bugs.webkit.org/show_bug.cgi?id=61957
When building inside the Qt source tree, qmake always append the mkspecs
defines after ours. We have to workaround and make sure that we append
our flags after the qmake variable used inside Qt. This workaround was provided
by our qmake folks.
* Source/WebKit.pri:
2011-06-02 Alexis Menard <[email protected]>
Reviewed by Andreas Kling.
[Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
https://bugs.webkit.org/show_bug.cgi?id=61957
When building inside the Qt source tree, qmake always append the mkspecs
defines after ours. We have to workaround and make sure that we append
our flags after the qmake variable used inside Qt. This workaround was provided
by our qmake folks.
* _javascript_Core.pro:
Modified Paths
Diff
Modified: trunk/ChangeLog (87949 => 87950)
--- trunk/ChangeLog 2011-06-02 20:20:34 UTC (rev 87949)
+++ trunk/ChangeLog 2011-06-02 20:37:58 UTC (rev 87950)
@@ -1,3 +1,17 @@
+2011-06-02 Alexis Menard <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
+ https://bugs.webkit.org/show_bug.cgi?id=61957
+
+ When building inside the Qt source tree, qmake always append the mkspecs
+ defines after ours. We have to workaround and make sure that we append
+ our flags after the qmake variable used inside Qt. This workaround was provided
+ by our qmake folks.
+
+ * Source/WebKit.pri:
+
2011-03-30 Martin Robinson <[email protected]>
Reviewed by Adam Roben.
Modified: trunk/Source/_javascript_Core/ChangeLog (87949 => 87950)
--- trunk/Source/_javascript_Core/ChangeLog 2011-06-02 20:20:34 UTC (rev 87949)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-06-02 20:37:58 UTC (rev 87950)
@@ -1,3 +1,17 @@
+2011-06-02 Alexis Menard <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
+ https://bugs.webkit.org/show_bug.cgi?id=61957
+
+ When building inside the Qt source tree, qmake always append the mkspecs
+ defines after ours. We have to workaround and make sure that we append
+ our flags after the qmake variable used inside Qt. This workaround was provided
+ by our qmake folks.
+
+ * _javascript_Core.pro:
+
2011-06-01 Oliver Hunt <[email protected]>
Reviewed by Geoffrey Garen.
Modified: trunk/Source/_javascript_Core/_javascript_Core.pro (87949 => 87950)
--- trunk/Source/_javascript_Core/_javascript_Core.pro 2011-06-02 20:20:34 UTC (rev 87949)
+++ trunk/Source/_javascript_Core/_javascript_Core.pro 2011-06-02 20:37:58 UTC (rev 87950)
@@ -215,6 +215,14 @@
lessThan(QT_GCC_MAJOR_VERSION, 5):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
+ *-g++* {
+ CONFIG(QTDIR_build) {
+ QMAKE_CFLAGS_WARN_ON = -Wno-c++0x-compat
+ QMAKE_CXXFLAGS_WARN_ON = -Wno-c++0x-compat
+ } else {
+ QMAKE_CFLAGS += -Wno-c++0x-compat
+ QMAKE_CXXFLAGS += -Wno-c++0x-compat
+ }
+ }
}
Modified: trunk/Source/WebKit.pri (87949 => 87950)
--- trunk/Source/WebKit.pri 2011-06-02 20:20:34 UTC (rev 87949)
+++ trunk/Source/WebKit.pri 2011-06-02 20:37:58 UTC (rev 87950)
@@ -97,8 +97,13 @@
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 += -Wno-c++0x-compat
- QMAKE_CXXFLAGS += -Wno-c++0x-compat
+ CONFIG(QTDIR_build) {
+ QMAKE_CFLAGS_WARN_ON = -Wno-c++0x-compat
+ QMAKE_CXXFLAGS_WARN_ON = -Wno-c++0x-compat
+ } else {
+ QMAKE_CFLAGS += -Wno-c++0x-compat
+ QMAKE_CXXFLAGS += -Wno-c++0x-compat
+ }
}
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
