Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Added support for QMAKE_CLEAN in symbian-sbsv2
  Only add NetworkServices capability automatically if no caps are set.

5 files changed, 41 insertions, 6 deletions

diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index aac6bb0..de6eb7f 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -735,9 +735,9 @@
     \row    \o QtCore
             \o \c AllFiles when \l{http://developer.symbian.org/wiki/index.php/Capabilities_%28Symbian_Signed%29/AllFiles_Capability}{accessing specific areas.}
     \row    \o QtDeclarative
-            \o \c NetworkServices is automatically added for this module.
+            \o \c NetworkServices is automatically added for this module if no capabilities are explicitly specified.
     \row    \o QtNetwork
-            \o \c NetworkServices is automatically added for this module.
+            \o \c NetworkServices is automatically added for this module if no capabilities are explicitly specified.
     \row    \o QtNetwork
             \o \c ReadUserData is required to include all the phone's SSL certificates in the system's default CA certificate list
                   (for example those added by the user or stored in the SIM card),
@@ -745,7 +745,7 @@
     \row    \o QtMultiMedia
             \o \c UserEnvironment if QAudioInput is used.
     \row    \o QtWebkit
-            \o \c NetworkServices is automatically added for this module.
+            \o \c NetworkServices is automatically added for this module if no capabilities are explicitly specified.
     \endtable
 
     \note Some modules rely on other modules. E.g. QtWebkit and QtDeclarative
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 964e13b..24c84a5 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -53,15 +53,15 @@ defineTest(qtAddLibrary) {
             # Needed for because relative inclusion problem in toolchain
             INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtXmlPatterns
             INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork
-            TARGET.CAPABILITY *= NetworkServices
+            isEmpty(TARGET.CAPABILITY): TARGET.CAPABILITY = NetworkServices
             isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
         } else:isEqual(LIB_NAME, QtXmlPatterns) {
             # Needed for #include <QtXmlPatterns/QtXmlPatterns> because relative inclusion problem in toolchain
             INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork
         } else:isEqual(LIB_NAME, QtNetwork) {
-            TARGET.CAPABILITY *= NetworkServices
+            isEmpty(TARGET.CAPABILITY): TARGET.CAPABILITY = NetworkServices
         } else:isEqual(LIB_NAME, QtDeclarative) {
-            TARGET.CAPABILITY *= NetworkServices
+            isEmpty(TARGET.CAPABILITY): TARGET.CAPABILITY = NetworkServices
             isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
         }
         export(TARGET.EPOCHEAPSIZE)
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm
new file mode 100644
index 0000000..fe35e6e
--- /dev/null
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm
@@ -0,0 +1,18 @@
+# /****************************************************************************
+# **
+# ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+# ** Contact: Nokia Corporation (qt-info@nokia.com)
+# **
+# ** This file is part of symbian-sbsv2 mkspec.
+# **
+# ****************************************************************************/
+
+
+SINGLETON:=$(call sanitise,QMAKE_CLEAN_SINGLETON_$(EXTENSION_ROOT))
+
+ifeq ($($(SINGLETON)),)
+# Prevent duplicate targets from being created
+$(SINGLETON):=1
+$(eval $(call GenerateStandardCleanTarget,$(CLEAN_FILES),''))
+endif
+
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml
index ddd8d55..f2f32ee 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qt.xml
+++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml
@@ -38,4 +38,9 @@
     <interface name="qt.qmake_store_build" extends="Symbian.UserFLM"
                 flm="qmake_store_build.flm">
     </interface>    
+
+    <interface name="qt.qmake_clean" extends="Symbian.UserFLM"
+                flm="qmake_clean.flm">
+        <param name='CLEAN_FILES' />
+    </interface>
 </build>
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index 9eccd46..f94a63f 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -721,6 +721,18 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
     t << "END" << endl;
     t << endl;
 
+    // Handle QMAKE_CLEAN
+    QStringList cleanFiles = project->values("QMAKE_CLEAN");
+    if (!cleanFiles.isEmpty()) {
+        QStringList absoluteCleanFiles;
+        foreach (QString cleanFile, cleanFiles) {
+            QFileInfo fi(cleanFile);
+            absoluteCleanFiles << fi.absoluteFilePath();
+        }
+        t << "START EXTENSION qt/qmake_clean" << endl;
+        t << "OPTION CLEAN_FILES " << absoluteCleanFiles.join(" ") << endl;
+        t << "END" << endl;
+    }
     t << endl;
 }