diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 16:10:27 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 16:10:27 +1000 |
| commit | 9e85af3454bd0a2d962523d52e688f9bc7259528 (patch) | |
| tree | f9c52865c980616c156c2380b7b7514eb1deaa2a /mkspecs | |
| parent | 3030bb7cfecf5db7cc8de14791369a015f5abb32 (diff) | |
| parent | 3e12d523ce4e2839bda0c1f709134cc6d3f507b3 (diff) | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Add flag for forcibly propagating backing store alpha to framebuffer
Fixed unmatched quotes in s60installs.pro
Added setSwitchPolicy to MeeGo graphicssystem helper API.
Add /q switch to QMAKE_DEL_FILE command in symbian
Diffstat (limited to 'mkspecs')
| -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 d9f6279f57..74acc64e76 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 |