summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-02-16 13:58:10 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-02-16 13:58:10 (GMT)
commitfdd305d4186919c9f75330b1dfd8aaed520d8430 (patch)
tree7acfaa62c8523d3f02b992dd37d415880d22167c
parentc21f29ffdee20495ec93ab8937c51c825703c319 (diff)
downloadQt-fdd305d4186919c9f75330b1dfd8aaed520d8430.zip
Qt-fdd305d4186919c9f75330b1dfd8aaed520d8430.tar.gz
Qt-fdd305d4186919c9f75330b1dfd8aaed520d8430.tar.bz2
Only use unix-like tools when not building for Symbian in Windows.
Having sh.exe but not the other unix-like basic tools in the path made distclean break in Windows. Task-number: QTBUG-7883 Reviewed-by: axis
-rw-r--r--mkspecs/common/symbian/symbian.conf18
1 files changed, 9 insertions, 9 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 6113746..7b2ee91 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -75,15 +75,7 @@ QMAKE_LIBS_COMPAT =
QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib
QMAKE_LIBS_S60 = -lavkon
-!isEmpty(QMAKE_SH) {
- QMAKE_COPY = cp
- QMAKE_COPY_DIR = cp -r
- QMAKE_MOVE = mv
- QMAKE_DEL_FILE = rm -f
- QMAKE_MKDIR = mkdir
- QMAKE_DEL_DIR = rmdir
- QMAKE_CHK_DIR_EXISTS = test -d
-} else {
+contains(QMAKE_HOST.os,Windows) {
QMAKE_COPY = copy /y
QMAKE_COPY_DIR = xcopy /s /q /y /i
QMAKE_MOVE = move
@@ -91,6 +83,14 @@ QMAKE_LIBS_S60 = -lavkon
QMAKE_MKDIR = mkdir
QMAKE_DEL_DIR = rmdir
QMAKE_CHK_DIR_EXISTS = if not exist
+} else {
+ QMAKE_COPY = cp
+ QMAKE_COPY_DIR = cp -r
+ QMAKE_MOVE = mv
+ QMAKE_DEL_FILE = rm -f
+ QMAKE_MKDIR = mkdir
+ QMAKE_DEL_DIR = rmdir
+ QMAKE_CHK_DIR_EXISTS = test -d
}
QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe