Title: [99290] trunk/Tools
- Revision
- 99290
- Author
- [email protected]
- Date
- 2011-11-04 10:06:06 -0700 (Fri, 04 Nov 2011)
Log Message
[Qt] Don't warn about disabling WebKit2 when qmake does recursive includes
Reviewed by Simon Hausmann.
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (99289 => 99290)
--- trunk/Tools/ChangeLog 2011-11-04 17:04:15 UTC (rev 99289)
+++ trunk/Tools/ChangeLog 2011-11-04 17:06:06 UTC (rev 99290)
@@ -1,5 +1,13 @@
2011-11-04 Tor Arne Vestbø <[email protected]>
+ [Qt] Don't warn about disabling WebKit2 when qmake does recursive includes
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/default_pre.prf:
+
+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.
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (99289 => 99290)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2011-11-04 17:04:15 UTC (rev 99289)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2011-11-04 17:06:06 UTC (rev 99290)
@@ -44,7 +44,7 @@
BUILD_SUBDIR = $$join(BUILD_SUBDIR, $${QMAKE_DIR_SEP})
equals(OUT_PWD, $${ROOT_BUILD_DIR}) {
- CONFIG += root_project_file
+ !recursive_include:CONFIG += root_project_file
BUILD_ROOT_RELATIVE_TO_OUT_PWD = .
} else {
subdir_parts = $$replace(OUT_PWD, ^$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP},)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
