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:
  Fix regression on Symbian
  Fix broken test case
  Cleanup the deployment code
  Fix 'make sis' finding the dll on symbian
  Re-add line that was lost during webkit update.
  Work around bad naming of exported class in symbian sdk causing conflict
  Fix building on public symbian SDK.
  Fix qmake with the symbian makespec failing when project has a dash in it
  Make s60main static lib not depend on QtCore
  Remove stray non-latin1 character
  Fix out-of-source symbian build for external apps
  Update EABI def files for 4.7
  Exporting QFontDatabase::removeAllApplicationFonts()
  Adding QFontDatabase::removeAllApplicationFonts()

5 files changed, 8 insertions, 10 deletions

diff --git a/qmake/generators/symbian/symbian_makefile.h b/qmake/generators/symbian/symbian_makefile.h
index 289f9ae..061866a 100644
--- a/qmake/generators/symbian/symbian_makefile.h
+++ b/qmake/generators/symbian/symbian_makefile.h
@@ -66,7 +66,6 @@ public:
 
         // Generate pkg files if there are any actual files to deploy
         bool generatePkg = false;
-        DeploymentList depList;
 
         if (targetType == TypeExe) {
             generatePkg = true;
@@ -81,7 +80,7 @@ public:
         }
 
         if (generatePkg) {
-            generatePkgFile(iconFile, depList, false);
+            generatePkgFile(iconFile, false);
         }
 
         // Get the application translations and convert to symbian OS lang code, i.e. decical number
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 54b60be..10889c4 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -142,7 +142,7 @@ void SymbianCommonGenerator::removeEpocSpecialCharacters(QString& str)
     removeSpecialCharacters(str);
 }
 
-void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, DeploymentList &depList, bool epocBuild)
+void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocBuild)
 {
     QMakeProject *project = generator->project;
     QString pkgTarget = project->first("QMAKE_ORIG_TARGET");
@@ -361,6 +361,7 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, Deployment
     QString remoteTestPath;
     remoteTestPath = QString("!:\\private\\%1").arg(privateDirUid);
 
+    DeploymentList depList;
     initProjectDeploySymbian(project, depList, remoteTestPath, true, epocBuild, "$(PLATFORM)", "$(TARGET)", generatedDirs, generatedFiles);
     if (depList.size())
         t << "; DEPLOYMENT" << endl;
diff --git a/qmake/generators/symbian/symbiancommon.h b/qmake/generators/symbian/symbiancommon.h
index e2b1173..3efe5a4 100644
--- a/qmake/generators/symbian/symbiancommon.h
+++ b/qmake/generators/symbian/symbiancommon.h
@@ -68,7 +68,7 @@ protected:
     QString removePathSeparators(QString &file);
     void removeSpecialCharacters(QString& str);
     void removeEpocSpecialCharacters(QString& str);
-    void generatePkgFile(const QString &iconFile, DeploymentList &depList, bool epocBuild);
+    void generatePkgFile(const QString &iconFile, bool epocBuild);
     bool containsStartWithItem(const QChar &c, const QStringList& src);
 
     void writeRegRssFile(QMap<QString, QStringList> &useritems);
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index 0fcd26d..e05ced2 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -187,7 +187,6 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
 
     // Generate pkg files if there are any actual files to deploy
     bool generatePkg = false;
-    DeploymentList depList;
 
     if (targetType == TypeExe) {
         generatePkg = true;
@@ -201,10 +200,10 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
     }
 
     if (generatePkg) {
-        generatePkgFile(iconFile, depList, true);
+        generatePkgFile(iconFile, true);
     }
 
-    writeBldInfContent(t, generatePkg, iconFile, depList);
+    writeBldInfContent(t, generatePkg, iconFile);
 
     // Generate empty wrapper makefile here, because wrapper makefile must exist before writeMkFile,
     // but all required data is not yet available.
@@ -948,7 +947,7 @@ void SymbianMakefileGenerator::writeMmpFileRulesPart(QTextStream& t)
     }
 }
 
-void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploymentExtension, const QString &iconFile, DeploymentList &depList)
+void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploymentExtension, const QString &iconFile)
 {
     // Read user defined bld inf rules
 
diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h
index d9ca390..b06ff5b 100644
--- a/qmake/generators/symbian/symmake.h
+++ b/qmake/generators/symbian/symmake.h
@@ -90,8 +90,7 @@ protected:
     void writeHeader(QTextStream &t);
     void writeBldInfContent(QTextStream& t,
                             bool addDeploymentExtension,
-                            const QString &iconFile,
-                            DeploymentList &depList);
+                            const QString &iconFile);
 
     static bool removeDuplicatedStrings(QStringList& stringList);