Title: [99685] trunk/Tools
- Revision
- 99685
- Author
- [email protected]
- Date
- 2011-11-09 03:56:05 -0800 (Wed, 09 Nov 2011)
Log Message
[Qt] Don't override config for the build_pass of debug_and_release
Qmake will parse the profile once for each configuration (debug and
release), with the build_pass option set. In that situation we don't
want to override what qmake is setting explicitly, otherwise the
debug-step will end up hitting all the release-scopes.
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (99684 => 99685)
--- trunk/Tools/ChangeLog 2011-11-09 11:55:49 UTC (rev 99684)
+++ trunk/Tools/ChangeLog 2011-11-09 11:56:05 UTC (rev 99685)
@@ -1,3 +1,16 @@
+2011-11-09 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Don't override config for the build_pass of debug_and_release
+
+ Qmake will parse the profile once for each configuration (debug and
+ release), with the build_pass option set. In that situation we don't
+ want to override what qmake is setting explicitly, otherwise the
+ debug-step will end up hitting all the release-scopes.
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/default_pre.prf:
+
2011-11-09 Simon Hausmann <[email protected]>
[Qt] Unbreak the Qt build (copy & paste mistake - oops)
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (99684 => 99685)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2011-11-09 11:55:49 UTC (rev 99684)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2011-11-09 11:56:05 UTC (rev 99685)
@@ -14,8 +14,10 @@
isEmpty(pro_file): CONFIG += recursive_include
# We default to release builds
-CONFIG += release
-CONFIG -= debug
+!build_pass {
+ CONFIG += release
+ CONFIG -= debug
+}
# Resolve root directories for source and build
ROOT_WEBKIT_DIR = $$replace(IN_PWD, /Tools/qmake/mkspecs/features,)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
