diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-04-28 07:54:49 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-04-28 07:54:49 (GMT) |
| commit | 64a4d0e36d65712a4041d376bd5ba982642efd04 (patch) | |
| tree | b86f7722ff4eee5b2a848e238ca3da1a63016401 /qmake | |
| parent | da6f674fcdb0995d44e99ea8a82392d2b3f7b69c (diff) | |
| parent | 189118e55fa4d3ac205d78130d2b4694e0fc9b86 (diff) | |
| download | Qt-64a4d0e36d65712a4041d376bd5ba982642efd04.zip Qt-64a4d0e36d65712a4041d376bd5ba982642efd04.tar.gz Qt-64a4d0e36d65712a4041d376bd5ba982642efd04.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index d1942c6..aee9745 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -157,7 +157,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 << "XCOPY = xcopy /d /f /h /r /k /y /i" << endl; + t << "XCOPY = xcopy /d /f /h /r /y /i" << endl; t << "ABLD = ABLD.BAT" << endl; t << "DEBUG_PLATFORMS = " << debugPlatforms.join(" ") << endl; t << "RELEASE_PLATFORMS = " << releasePlatforms.join(" ") << endl; |