diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-06 13:36:13 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-06 13:36:13 (GMT) |
| commit | 1f98a7dcab0a714bf383ccd5fb2f82df25e7b8f7 (patch) | |
| tree | ced277dbef68d8715f6951aae8c965d00ffd0b65 /qmake | |
| parent | c7e4d0de2aaa2b5e44c9b38bcfa026bfb9492765 (diff) | |
| parent | d705d2b86afd6ad34d3fcc3311d4c2801852e33a (diff) | |
| download | Qt-1f98a7dcab0a714bf383ccd5fb2f82df25e7b8f7.zip Qt-1f98a7dcab0a714bf383ccd5fb2f82df25e7b8f7.tar.gz Qt-1f98a7dcab0a714bf383ccd5fb2f82df25e7b8f7.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 1 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index 1a4aa35..48b2a8a 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -186,6 +186,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 aeb305f..b8ff3b5 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -130,6 +130,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; |