Title: [128180] trunk/Tools
- Revision
- 128180
- Author
- [email protected]
- Date
- 2012-09-11 07:04:32 -0700 (Tue, 11 Sep 2012)
Log Message
[Qt] Fix output paths on Windows
Reviewed by Tor Arne Vestbø.
BUILD_ROOT_RELATIVE_TO_OUT_PWD was calculated incorrectly Windows, resulting in an incorrect
DESTDIR transformation at the end of default_post.prf. The calculation should be baased no qmake
paths, which can use drive letters but always use forward slashes. So the use of QMAKE_DIR_SEP is
incorrect here and instead for the calculation we should use forward slashes.
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128179 => 128180)
--- trunk/Tools/ChangeLog 2012-09-11 13:55:50 UTC (rev 128179)
+++ trunk/Tools/ChangeLog 2012-09-11 14:04:32 UTC (rev 128180)
@@ -1,3 +1,16 @@
+2012-09-11 Simon Hausmann <[email protected]>
+
+ [Qt] Fix output paths on Windows
+
+ Reviewed by Tor Arne Vestbø.
+
+ BUILD_ROOT_RELATIVE_TO_OUT_PWD was calculated incorrectly Windows, resulting in an incorrect
+ DESTDIR transformation at the end of default_post.prf. The calculation should be baased no qmake
+ paths, which can use drive letters but always use forward slashes. So the use of QMAKE_DIR_SEP is
+ incorrect here and instead for the calculation we should use forward slashes.
+
+ * qmake/mkspecs/features/default_pre.prf:
+
2012-09-11 Tor Arne Vestbø <[email protected]>
[Qt] Fix passing of defines from the build system
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (128179 => 128180)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-09-11 13:55:50 UTC (rev 128179)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-09-11 14:04:32 UTC (rev 128180)
@@ -39,12 +39,12 @@
!recursive_include:CONFIG += root_project_file
BUILD_ROOT_RELATIVE_TO_OUT_PWD = .
} else {
- subdir_parts = $$replace(OUT_PWD, ^$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP},)
- subdir_parts = $$split(subdir_parts, $${QMAKE_DIR_SEP})
+ subdir_parts = $$replace(OUT_PWD, ^$${ROOT_BUILD_DIR}/,)
+ subdir_parts = $$split(subdir_parts, /)
for(subdir, subdir_parts) {
BUILD_ROOT_RELATIVE_TO_OUT_PWD += ..
}
- BUILD_ROOT_RELATIVE_TO_OUT_PWD = $$join(BUILD_ROOT_RELATIVE_TO_OUT_PWD, $${QMAKE_DIR_SEP})
+ BUILD_ROOT_RELATIVE_TO_OUT_PWD = $$join(BUILD_ROOT_RELATIVE_TO_OUT_PWD, /)
}
# Try to detect if we're running under Windows cmd.exe or not
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
