Symbian: SIS files are not created per project now

Reviewed-by: Daniel Teske

src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp

@@ -148,12 +148,31 @@ bool S60DeployConfiguration::isStaticLibrary(const Qt4ProFileNode &projectNode)
     return false;
 }
 
+bool S60DeployConfiguration::isApplication(const Qt4ProFileNode &projectNode) const
+{
+    return projectNode.projectType() == ApplicationTemplate;
+}
+
+bool S60DeployConfiguration::isDeployable(const Qt4ProFileNode &projectNode) const
+{
+    const QStringList &deployment(projectNode.variableValue(Deployment));
+    // default_*deployment are default for DEPLOYMENT
+    const char * defaultDeploymentStart = "default_";
+    const char * defaultDeploymentEnd = "deployment";
+
+    //we need to filter out the default_*deployment
+    for (int i = deployment.count() - 1; i >= 0; --i) {
+        const QString var = deployment.at(i);
+        if (!var.startsWith(QLatin1String(defaultDeploymentStart))
+                || !var.endsWith(QLatin1String(defaultDeploymentEnd)))
+            return true;
+    }
+    return false;
+}
+
 bool S60DeployConfiguration::hasSisPackage(const Qt4ProFileNode &projectNode) const
 {
-    if (projectNode.projectType() != ApplicationTemplate
+    return isDeployable(projectNode) || isApplication(projectNode);
-            && projectNode.projectType() != LibraryTemplate)
-        return false;
-    return !isStaticLibrary(projectNode);
 }
 
 QStringList S60DeployConfiguration::signedPackages() const

src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h

@@ -130,7 +130,9 @@ private:
     QString symbianTarget() const;
     QString createPackageName(const QString &baseName) const;
     bool isDebug() const;
+    bool isDeployable(const Qt4ProFileNode &projectNode) const;
     bool isStaticLibrary(const Qt4ProFileNode &projectNode) const;
+    bool isApplication(const Qt4ProFileNode &projectNode) const;
     bool hasSisPackage(const Qt4ProFileNode &projectNode) const;
 
 private:

src/plugins/qt4projectmanager/qt4nodes.cpp

@@ -1745,6 +1745,7 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
                     QLatin1String("QML_IMPORT_PATH"), m_projectDir);
         newVarValues[Makefile] = m_readerExact->values("MAKEFILE");
         newVarValues[SymbianCapabilities] = m_readerExact->values("TARGET.CAPABILITY");
+        newVarValues[Deployment] = m_readerExact->values("DEPLOYMENT");
 
         if (m_varValues != newVarValues) {
             Qt4VariablesHash oldValues = m_varValues;

src/plugins/qt4projectmanager/qt4nodes.h

@@ -104,7 +104,8 @@ enum Qt4Variable {
     ConfigVar,
     QmlImportPathVar,
     Makefile,
-    SymbianCapabilities
+    SymbianCapabilities,
+    Deployment
 };
 
 class Qt4PriFileNode;