Title: [99287] trunk/Tools
- Revision
- 99287
- Author
- [email protected]
- Date
- 2011-11-04 09:55:42 -0700 (Fri, 04 Nov 2011)
Log Message
[Qt] Don't error out on wrong Qt version when qmake does recursive includes
Reviewed by Simmon Hausmann.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (99286 => 99287)
--- trunk/Tools/ChangeLog 2011-11-04 16:41:19 UTC (rev 99286)
+++ trunk/Tools/ChangeLog 2011-11-04 16:55:42 UTC (rev 99287)
@@ -1,5 +1,13 @@
2011-11-04 Tor Arne Vestbø <[email protected]>
+ [Qt] Don't error out on wrong Qt version when qmake does recursive includes
+
+ Reviewed by Simmon Hausmann.
+
+ * qmake/mkspecs/features/default_pre.prf:
+
+2011-11-04 Tor Arne Vestbø <[email protected]>
+
[Qt] Disable STDIN check before cleaning build dir
It didn't work on the bots.
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (99286 => 99287)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2011-11-04 16:41:19 UTC (rev 99286)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2011-11-04 16:55:42 UTC (rev 99287)
@@ -8,6 +8,11 @@
load(default_pre) # Load Qt's defaults
load(functions)
+# FIXME: In this case we probably want to exit early so that we
+# don't load all of the custom build tweaks needlessly.
+pro_file = $$_PRO_FILE_ # Checking the variable directly does not work
+isEmpty(pro_file): CONFIG += recursive_include
+
# We default to release builds
CONFIG += release
CONFIG -= debug
@@ -78,7 +83,7 @@
scratchbox: PYTHON = python2.6
else: PYTHON = python
-!haveQt(4, 8): error("Building WebKit with Qt versions older than 4.8 is not supported.")
+!haveQt(4, 8):!recursive_include: error("Building WebKit with Qt versions older than 4.8 is not supported.")
!haveQt(5):!no_webkit2 {
root_project_file {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
