Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11

1 files changed, 6 insertions, 4 deletions

diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index c6dec6d0b8..47c5b317c6 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -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;
     }