diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-02-04 11:40:27 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-02-04 11:40:27 (GMT) |
| commit | 7b46aa91709fd7df0ca791d63f68ee5a9436d50a (patch) | |
| tree | fd10fd74d729124d6ef4099f6fe933e3ad9fa9ab /qmake/generators/makefile.cpp | |
| parent | 4cd8dd562ea149d5a6cdcc15533e4975682106f6 (diff) | |
| parent | 3569038ffec0c133ff29f80d506f334cc0f2ddb3 (diff) | |
| download | Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.zip Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.tar.gz Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 7424d1d..69e1d8a 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1824,11 +1824,12 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) cleans.append(files); } } - if(!cleans.isEmpty()) + if(!cleans.isEmpty()) { if (isForSymbian()) t << valGlue(cleans, "\n\t" + del_statement, " 2> NUL\n\t" + del_statement, " 2> NUL"); else t << valGlue(cleans, "\n\t" + del_statement, "\n\t" + del_statement, ""); + } if(!wrote_clean_cmds) { for(QStringList::ConstIterator input = tmp_inputs.begin(); input != tmp_inputs.end(); ++input) { t << "\n\t" << replaceExtraCompilerVariables(tmp_clean_cmds, (*input), @@ -2535,6 +2536,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.fileName())); if(!ofile.isEmpty()) t << "\t-$(DEL_FILE) " << ofile << endl; + t << varGlue("QMAKE_DISTCLEAN","\t-$(DEL_FILE) "," ","\n"); } else if(project->isActiveConfig("no_empty_targets")) { t << "\t" << "@cd ." << endl; } |