summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-g++
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-05-06 15:39:30 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-05-14 11:45:36 (GMT)
commitf31461a35ae3d749c2d5445659ed55dad93e3b43 (patch)
treef6cef5d89ead6ee7131a8b46edfa3a2b553effff /mkspecs/win32-g++
parent6d4e67674f0ca5824761ec29f20dd854d47b4ac7 (diff)
downloadQt-f31461a35ae3d749c2d5445659ed55dad93e3b43.zip
Qt-f31461a35ae3d749c2d5445659ed55dad93e3b43.tar.gz
Qt-f31461a35ae3d749c2d5445659ed55dad93e3b43.tar.bz2
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
this would have been a problem if someone accessed QMAKE_QMAKE from within a pro file, as that would fix the separators to the native host platform separator (as QMAKE_DIR_SEP is not processed at that point). Reviewed-by: joerg
Diffstat (limited to 'mkspecs/win32-g++')
-rw-r--r--mkspecs/win32-g++/qmake.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index b282f69..8881d02 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -75,6 +75,7 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
!isEmpty(QMAKE_SH) {
MINGW_IN_SHELL = 1
QMAKE_DIR_SEP = /
+ QMAKE_QMAKE ~= s,\\\\,/,
QMAKE_COPY = cp
QMAKE_COPY_DIR = xcopy /s /q /y /i
QMAKE_MOVE = mv