diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-01-18 09:44:29 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-01-18 16:12:18 (GMT) |
commit | 340bfb6d4b324dfc124ea9fd03d796eed4cc5fb5 (patch) | |
tree | 6e1139f092919906c6290e692f2fe5181a125693 /qmake | |
parent | a71fdfc76a53d4db668e053f445f7ac4b9f91115 (diff) | |
download | Qt-340bfb6d4b324dfc124ea9fd03d796eed4cc5fb5.zip Qt-340bfb6d4b324dfc124ea9fd03d796eed4cc5fb5.tar.gz Qt-340bfb6d4b324dfc124ea9fd03d796eed4cc5fb5.tar.bz2 |
Remove toolcheck from generic clean targets for symbian-sbsv2
Toolcheck can cause generic clean fail (i.e. "make clean" or
"make debug-clean") for e.g. environments where Carbide command
line tools have not been installed, because sbsv2 toolchain does a
check for all tools related to target platforms, even though they are
not needed for actual cleaning.
Task-number: QTBUG-16691
Reviewed-by: Janne Koskinen
(cherry picked from commit c756d5cffdc31228b9ab9388c307bf4eb705b923)
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index f6f2e78..47c5b31 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -386,7 +386,7 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo } t << endl; t << "clean-debug: " << BLD_INF_FILENAME << endl; - t << "\t$(SBS) reallyclean"; + t << "\t$(SBS) reallyclean --toolcheck=off"; foreach(QString clause, debugClauses) { t << clause; } @@ -406,7 +406,7 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo } t << endl; t << "clean-release: " << BLD_INF_FILENAME << endl; - t << "\t$(SBS) reallyclean"; + t << "\t$(SBS) reallyclean --toolcheck=off"; foreach(QString clause, releaseClauses) { t << clause; } @@ -516,8 +516,10 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo generateDistcleanTargets(t); + // Do not check for tools when doing generic clean, as most tools are not actually needed for + // cleaning. Mainly this is relevant for environments that do not have winscw compiler. t << "clean: " << BLD_INF_FILENAME << endl; - t << "\t-$(SBS) reallyclean"; + t << "\t-$(SBS) reallyclean --toolcheck=off"; foreach(QString clause, allClauses) { t << clause; } |