diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-06 12:37:07 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-06 12:37:07 (GMT) |
| commit | d705d2b86afd6ad34d3fcc3311d4c2801852e33a (patch) | |
| tree | 9c933153622281d315e3fe9dcad735e74506a80a | |
| parent | 60e2c80ba7f0d4657ca99d5bd90bf2e81b4cf1c5 (diff) | |
| parent | 30adf7d302b75b6af57196932ca619a9c2087db7 (diff) | |
| download | Qt-d705d2b86afd6ad34d3fcc3311d4c2801852e33a.zip Qt-d705d2b86afd6ad34d3fcc3311d4c2801852e33a.tar.gz Qt-d705d2b86afd6ad34d3fcc3311d4c2801852e33a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 1 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 1 |
3 files changed, 3 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 diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index 17c365d..e537df9 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -190,6 +190,7 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool t << "QMAKE = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl; t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl; t << "DEL_DIR = " << var("QMAKE_DEL_DIR") << endl; + t << "MOVE = " << var("QMAKE_MOVE") << endl; t << "XCOPY = xcopy /d /f /h /r /y /i" << endl; t << "ABLD = ABLD.BAT" << endl; t << "DEBUG_PLATFORMS = " << debugPlatforms.join(" ") << endl; diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 34585e8..885d8a6 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -133,6 +133,7 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo t << "QMAKE = " << Option::fixPathToTargetOS(var("QMAKE_QMAKE")) << endl; t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl; t << "DEL_DIR = " << var("QMAKE_DEL_DIR") << endl; + t << "MOVE = " << var("QMAKE_MOVE") << endl; t << "DEBUG_PLATFORMS = " << debugPlatforms.join(" ") << endl; t << "RELEASE_PLATFORMS = " << releasePlatforms.join(" ") << endl; t << "MAKE = make" << endl; |