Title: [119269] trunk
- Revision
- 119269
- Author
- [email protected]
- Date
- 2012-06-01 13:00:43 -0700 (Fri, 01 Jun 2012)
Log Message
[Qt] Use -Werror only in developer builds
Rubber-stamped by Tor Arne Vestbø.
In production builds -Werror with custom toolchains and wierd system
headers, -Werror is of no use and just creates confusion. So use it
only if Qt is configured with -developer-build.
.:
* Source/api.pri: qt_developer_build determination moved to default_pre.prf
Tools:
* qmake/mkspecs/features/default_pre.prf: Move qt_developer_build determination here...
* qmake/mkspecs/features/unix/default_post.prf: ... so that we can use it here to do -Werror
only if qt_developer_build is set.
Modified Paths
Diff
Modified: trunk/ChangeLog (119268 => 119269)
--- trunk/ChangeLog 2012-06-01 19:58:16 UTC (rev 119268)
+++ trunk/ChangeLog 2012-06-01 20:00:43 UTC (rev 119269)
@@ -1,3 +1,15 @@
+2012-06-01 Simon Hausmann <[email protected]>
+
+ [Qt] Use -Werror only in developer builds
+
+ Rubber-stamped by Tor Arne Vestbø.
+
+ In production builds -Werror with custom toolchains and wierd system
+ headers, -Werror is of no use and just creates confusion. So use it
+ only if Qt is configured with -developer-build.
+
+ * Source/api.pri: qt_developer_build determination moved to default_pre.prf
+
2012-06-01 Caio Marcelo de Oliveira Filho <[email protected]>
[Qt] Move QObject bridge related tests from tst_qwebframe to tst_qobjectbridge
Modified: trunk/Source/api.pri (119268 => 119269)
--- trunk/Source/api.pri 2012-06-01 19:58:16 UTC (rev 119268)
+++ trunk/Source/api.pri 2012-06-01 20:00:43 UTC (rev 119269)
@@ -42,10 +42,6 @@
# have to make sure the rpath/install_name of the libraries are relative
# to the webkit build dir.
- # We use private_tests to detect developer build, since the destdir will
- # always be our webkit build dir. This might change as configure changes.
- contains(QT_CONFIG, private_tests): CONFIG += qt_developer_build
-
!build_pass {
# Make a more accessible copy of the module forward file
# in the WebKit build directory.
Modified: trunk/Tools/ChangeLog (119268 => 119269)
--- trunk/Tools/ChangeLog 2012-06-01 19:58:16 UTC (rev 119268)
+++ trunk/Tools/ChangeLog 2012-06-01 20:00:43 UTC (rev 119269)
@@ -1,3 +1,17 @@
+2012-06-01 Simon Hausmann <[email protected]>
+
+ [Qt] Use -Werror only in developer builds
+
+ Rubber-stamped by Tor Arne Vestbø.
+
+ In production builds -Werror with custom toolchains and wierd system
+ headers, -Werror is of no use and just creates confusion. So use it
+ only if Qt is configured with -developer-build.
+
+ * qmake/mkspecs/features/default_pre.prf: Move qt_developer_build determination here...
+ * qmake/mkspecs/features/unix/default_post.prf: ... so that we can use it here to do -Werror
+ only if qt_developer_build is set.
+
2012-06-01 Jochen Eisinger <[email protected]>
[watchlist] Add myself to loader and v8 bindings changes
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (119268 => 119269)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-06-01 19:58:16 UTC (rev 119268)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-06-01 20:00:43 UTC (rev 119269)
@@ -109,6 +109,10 @@
}
}
+# We use private_tests to detect developer build, since the destdir will
+# always be our webkit build dir. This might change as configure changes.
+contains(QT_CONFIG, private_tests): CONFIG += qt_developer_build
+
haveQt(4) {
# Qt5 will automatically load the module files for us, but for Qt4
# we have to do it manually so that the various QT.webkit.foo names
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_post.prf (119268 => 119269)
--- trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-06-01 19:58:16 UTC (rev 119268)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-06-01 20:00:43 UTC (rev 119269)
@@ -13,7 +13,7 @@
}
# Treat warnings as errors on x86/Linux/GCC
-linux-g++* {
+qt_developer_build: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) {
!contains(QMAKE_CXXFLAGS, -std=(c|gnu)\\+\\+(0x|11)) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
