summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-18 14:51:38 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-18 14:51:38 (GMT)
commit8ec9e1c261a9992a8df0a0e2ec04ecf4c22575af (patch)
treec2c14ba021453436a9bbb5d906ac1ab7e8ed9bfa
parent1811da78fc63371e2639a230e0aa81ed7f47695a (diff)
parentd164ca3dd62cb645767f332b7cddf07b400c8beb (diff)
downloadQt-8ec9e1c261a9992a8df0a0e2ec04ecf4c22575af.zip
Qt-8ec9e1c261a9992a8df0a0e2ec04ecf4c22575af.tar.gz
Qt-8ec9e1c261a9992a8df0a0e2ec04ecf4c22575af.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add /q switch to QMAKE_DEL_FILE command in symbian
-rw-r--r--mkspecs/common/symbian/symbian.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index c16e4f1..eab9644 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -93,7 +93,7 @@ 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_DEL_FILE = del /q 2> NUL
QMAKE_MKDIR = mkdir
QMAKE_DEL_DIR = rmdir
QMAKE_DEL_TREE = rmdir /s /q