diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-06 11:37:15 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-06 11:37:15 (GMT) |
| commit | f577abca43ec341ac4b96d5a9fb6fcfdc7411965 (patch) | |
| tree | 0df451f4de071f2e055cd3850a1513ef9ecab2e0 /qmake/generators/metamakefile.cpp | |
| parent | 31f4e677256487e7d167517ffd5dd4bef6bb4dd4 (diff) | |
| parent | 1b7d4d29d970405d5559c5641260ea1f09375b27 (diff) | |
| download | Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.zip Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.tar.gz Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'qmake/generators/metamakefile.cpp')
| -rw-r--r-- | qmake/generators/metamakefile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index e22710d..4a9fd8d 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -294,9 +294,9 @@ SubdirsMetaMakefileGenerator::init() init_flag = true; if(Option::recursive) { - QString old_output_dir = QDir::cleanPath(Option::output_dir); + QString old_output_dir = Option::output_dir; QString old_output = Option::output.fileName(); - QString oldpwd = QDir::cleanPath(qmake_getpwd()); + QString oldpwd = qmake_getpwd(); QString thispwd = oldpwd; if(!thispwd.endsWith('/')) thispwd += '/'; |