diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-08-06 11:58:57 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-08-06 11:58:57 (GMT) |
commit | 30adf7d302b75b6af57196932ca619a9c2087db7 (patch) | |
tree | f5ed9f24283c86e8d8208ed06d61acb1f34b2743 | |
parent | ed35633a5953d9d1f52b910347c778a5ddc622d2 (diff) | |
download | Qt-30adf7d302b75b6af57196932ca619a9c2087db7.zip Qt-30adf7d302b75b6af57196932ca619a9c2087db7.tar.gz Qt-30adf7d302b75b6af57196932ca619a9c2087db7.tar.bz2 |
Fix extern WebKit build that uses qmake generators.
WebCore.pro's generators use QMAKE_DEL, which when used with del.exe
works if the file is present or not. In the QMAKE_SH branch QMAKE_DEL
is mapped to rm, which complaints if the file to delete doesn't exist.
Similar to del.exe and unix.conf use rm -f instead of rm for QMAKE_DEL
in the QMAKE_SH branch.
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
-rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 554bf85..65bb69d 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -77,7 +77,7 @@ QMAKE_LIBS_S60 = -lavkon -leikcoctl QMAKE_COPY = cp QMAKE_COPY_DIR = cp -r QMAKE_MOVE = mv - QMAKE_DEL_FILE = rm + QMAKE_DEL_FILE = rm -f QMAKE_MKDIR = mkdir QMAKE_DEL_DIR = rmdir QMAKE_CHK_DIR_EXISTS = test -d |