Title: [105729] trunk/Tools
- Revision
- 105729
- Author
- [email protected]
- Date
- 2012-01-24 04:31:00 -0800 (Tue, 24 Jan 2012)
Log Message
[Qt] Distinguish between Cygwin and cmd.exe in the way we set env variables
We can't use win32-msvc* to decide whether or not to use (set FOO=bar), as
building with MinGW inside cmd.exe will require the same construct. Instead
we assume that when the first character in PWD is a '/' we're running under
Cygwin, and use the normal unix way of setting environment variables.
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (105728 => 105729)
--- trunk/Tools/ChangeLog 2012-01-24 12:28:31 UTC (rev 105728)
+++ trunk/Tools/ChangeLog 2012-01-24 12:31:00 UTC (rev 105729)
@@ -1,3 +1,16 @@
+2012-01-24 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Distinguish between Cygwin and cmd.exe in the way we set env variables
+
+ We can't use win32-msvc* to decide whether or not to use (set FOO=bar), as
+ building with MinGW inside cmd.exe will require the same construct. Instead
+ we assume that when the first character in PWD is a '/' we're running under
+ Cygwin, and use the normal unix way of setting environment variables.
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/default_pre.prf:
+
2012-01-24 Simon Hausmann <[email protected]>
Some qmake build files must include Qt5's "quick" module.
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (105728 => 105729)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-01-24 12:28:31 UTC (rev 105728)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-01-24 12:31:00 UTC (rev 105729)
@@ -43,8 +43,17 @@
}
# Make sure QMAKEPATH is set for recursive targets
-win32-msvc*: QMAKE_QMAKE = \(set QMAKEPATH=$$(QMAKEPATH)\) && $$QMAKE_QMAKE
-else: QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
+win32* {
+ pwd = $$(PWD) # Normally empty for cmd.exe
+ is_building_under_cygwin = $$find(pwd, ^/)
+ !isEmpty(is_building_under_cygwin) {
+ QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
+ } else {
+ QMAKE_QMAKE = \(set QMAKEPATH=$$(QMAKEPATH)\) && $$QMAKE_QMAKE
+ }
+} else {
+ QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
+}
# Default location of generated sources
GENERATED_SOURCES_DESTDIR = generated
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
