4 files changed, 15 insertions, 23 deletions
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
index 6a05cc1..f9fae9d 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
@@ -255,7 +255,8 @@ void initProjectDeploySymbian(QMakeProject* project,
 
         QStringList flags = project->values(item + ".flags");
 
-        foreach(QString source, project->values(item + ".sources")) {
+        // ### Qt 5: remove .sources, inconsistent with INSTALLS
+        foreach(QString source, project->values(item + ".sources") + project->values(item + ".files")) {
             source = Option::fixPathToLocalOS(source);
             QString nameFilter;
             QFileInfo info(source);
diff --git a/qmake/generators/symbian/symbian_makefile.h b/qmake/generators/symbian/symbian_makefile.h
index baf0d01..c49845a 100644
--- a/qmake/generators/symbian/symbian_makefile.h
+++ b/qmake/generators/symbian/symbian_makefile.h
@@ -72,7 +72,9 @@ public:
         } else {
             const QStringList deployments = this->project->values("DEPLOYMENT");
             for (int i = 0; i < deployments.count(); ++i) {
-                if (!this->project->values(deployments.at(i) + ".sources").isEmpty()) {
+                // ### Qt 5: remove .sources, inconsistent with INSTALLS
+                if (!this->project->values(deployments.at(i) + ".sources").isEmpty() ||
+                    !this->project->values(deployments.at(i) + ".files").isEmpty()) {
                     generatePkg = true;
                     break;
                 }
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 96d7725..32b465b 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -394,11 +394,10 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile,
         t << manufacturerStr << endl;
     }
 
-    // ### FIXME: remove epocBuild check once makefile based mkspecs support localized resource generation
-    if (epocBuild && symbianLocalizationList.size()) {
+    if (symbianLocalizationList.size()) {
         // Add localized resources to DEPLOYMENT if default resource deployment is done
-        addLocalizedResourcesToDeployment("default_resource_deployment.sources", symbianLocalizationList);
-        addLocalizedResourcesToDeployment("default_reg_deployment.sources", symbianLocalizationList);
+        addLocalizedResourcesToDeployment("default_resource_deployment.files", symbianLocalizationList);
+        addLocalizedResourcesToDeployment("default_reg_deployment.files", symbianLocalizationList);
     }
 
     // deploy files specified by DEPLOYMENT variable
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index 4f9f22d..08d3370 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -203,7 +203,9 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
         generatePkg = true;
     } else {
         foreach(QString item, project->values("DEPLOYMENT")) {
-            if (!project->values(item + ".sources").isEmpty()) {
+            // ### Qt 5: remove .sources, inconsistent with INSTALLS
+            if (!project->values(item + ".sources").isEmpty() ||
+                !project->values(item + ".files").isEmpty()) {
                 generatePkg = true;
                 break;
             }
@@ -715,25 +717,13 @@ void SymbianMakefileGenerator::writeMmpFileLibraryPart(QTextStream& t)
         if (lib.startsWith("-l")) {
             lib.remove(0, 2);
             QString mmpStatement;
-            if (lib.endsWith(".dll")) {
-                lib.chop(4);
-                mmpStatement = "LIBRARY\t\t";
-            } else if (lib.endsWith(".lib")) {
+            if (lib.endsWith(".lib")) {
                 lib.chop(4);
                 mmpStatement = "STATICLIBRARY\t";
             } else {
-                // Hacky way to find out what kind of library it is. Check the
-                // ARMV5 build directory for library type. We default to shared
-                // library, since that is more common.
-                QString udebStaticLibLocation(qt_epocRoot());
-                QString urelStaticLibLocation(udebStaticLibLocation);
-                udebStaticLibLocation += QString("epoc32/release/armv5/udeb/%1.lib").arg(lib);
-                urelStaticLibLocation += QString("epoc32/release/armv5/urel/%1.lib").arg(lib);
-                if (QFile::exists(udebStaticLibLocation) || QFile::exists(urelStaticLibLocation)) {
-                    mmpStatement = "STATICLIBRARY\t";
-                } else {
-                    mmpStatement = "LIBRARY\t\t";
-                }
+                if (lib.endsWith(".dll"))
+                    lib.chop(4);
+                mmpStatement = "LIBRARY\t\t";
             }
             t << mmpStatement <<  lib << ".lib" << endl;
         }