diff options
| author | axis <qt-info@nokia.com> | 2010-02-18 15:31:01 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-18 15:31:01 +0100 |
| commit | d24f440ed547f8e9a3737670e41bb645a9159501 (patch) | |
| tree | 14e9ac83c6d688e5480403a152e3ad2e60566ea8 /mkspecs/common | |
| parent | b477d02479d9effbdb97e189a60dbf44dda5cbc9 (diff) | |
| parent | 505dc33a4060b6fb2a80f3a3ab2a6702ec0b5f3b (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-with-qt-master
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/Makefile.unix
qmake/generators/makefile.cpp
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index cfe3c24f21..a11f011561 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -68,23 +68,24 @@ QMAKE_LIBS_COMPAT = QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib QMAKE_LIBS_S60 = -lavkon -!isEmpty(QMAKE_SH) { - QMAKE_COPY = cp -f - QMAKE_COPY_FILE = $(COPY) - QMAKE_COPY_DIR = $(COPY) -r - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p +!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 { - QMAKE_COPY = copy /y - QMAKE_COPY_DIR = xcopy /s /q /y /i - QMAKE_MOVE = move - QMAKE_DEL_FILE = del - QMAKE_MKDIR = mkdir - QMAKE_DEL_DIR = rmdir - QMAKE_CHK_DIR_EXISTS = if not exist + 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_CHK_DIR_EXISTS = if not exist } QMAKE_IDL = midl |