diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-03-02 12:17:49 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-03-02 12:17:49 (GMT) |
| commit | d0c6958922627154bd907569e1ce5b830cb353f6 (patch) | |
| tree | cbd6a74c2c008205ce596ab57fdd483764f20554 /mkspecs/common/symbian/symbian.conf | |
| parent | 984c227bb23cff57fbad6710fdac5c5dfc056409 (diff) | |
| parent | 04bda2f714ab2b8352d00a36cec906cdc0ca53ea (diff) | |
| download | Qt-d0c6958922627154bd907569e1ce5b830cb353f6.zip Qt-d0c6958922627154bd907569e1ce5b830cb353f6.tar.gz Qt-d0c6958922627154bd907569e1ce5b830cb353f6.tar.bz2 | |
Merge branch 'master' into gcce
Diffstat (limited to 'mkspecs/common/symbian/symbian.conf')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index b496f72..2f1cb88 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -68,24 +68,24 @@ QMAKE_LIBS_COMPAT = QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib QMAKE_LIBS_S60 = -lavkon -!contains(QMAKE_HOST.os, "Windows")|!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_DEL_TREE = rmdir /s /q - 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 QMAKE_DEL_FILE = del 2> NUL QMAKE_MKDIR = mkdir QMAKE_DEL_DIR = rmdir - QMAKE_DEL_TREE = rm -rf + QMAKE_DEL_TREE = rmdir /s /q 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_DEL_TREE = rm -rf + QMAKE_CHK_DIR_EXISTS = test -d } QMAKE_IDL = midl |