Implemented pkg generator for the symbian/linux-armcc mkspec.

It reuses almost everything from the original pkg generator, but the
code had to be restructured to accomodate for the new makefile
generator. In addition a few new codepaths and profile changes had to
be introduced to cope with the fact that this mkspec puts files in
different places than Symbian does (inside $QTDIR/lib instead of
$EPOCROOT/...).

This enables the pkg generator to generate correct pkg files for Qt
itself, but applications will not work yet because they also require
generated rss files.

16 files changed, 479 insertions, 266 deletions

diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index fcf43c8..0ff5b38 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -10,7 +10,8 @@ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o  \
      mingw_make.o option.o winmakefile.o projectgenerator.o \
      meta.o makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
      borland_bmake.o msvc_dsp.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o \
-     symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o
+     symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o \
+     symbiancommon.o
 
 #qt code
 QOBJS=qtextcodec.o qutfcodec.o qstring.o qtextstream.o qiodevice.o qmalloc.o qglobal.o \
@@ -33,6 +34,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
 	   generators/win32/msvc_objectmodel.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
 	   generators/symbian/symmake.cpp generators/symbian/initprojectdeploy_symbian.cpp \
 	   generators/symbian/symmake_abld.cpp generators/symbian/symmake_sbsv2.cpp \
+           generaters/symbian/symbiancommon.cpp \
 	   $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \
 	   $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \
@@ -230,7 +232,7 @@ option.o: option.cpp option.h $(BUILD_PATH)/src/corelib/global/qconfig.cpp
 qcryptographichash.o:  $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp
 
-metamakefile.o: generators/metamakefile.cpp
+metamakefile.o: generators/metamakefile.cpp generators/symbian/symbian_makefile.h
 	$(CXX) -c -o $@ $(CXXFLAGS) generators/metamakefile.cpp
 
 xmloutput.o: generators/xmloutput.cpp
@@ -278,6 +280,9 @@ symmake_abld.o: generators/symbian/symmake_abld.cpp
 symmake_sbsv2.o: generators/symbian/symmake_sbsv2.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
 
+symbiancommon.o: generators/symbian/symbiancommon.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symbiancommon.cpp
+
 initprojectdeploy_symbian.o: generators/symbian/initprojectdeploy_symbian.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
 
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index e6bbcd5..9ecce24 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -75,7 +75,7 @@ OBJS        = project.obj main.obj makefile.obj unixmake.obj unixmake2.obj mingw
               makefiledeps.obj metamakefile.obj xmloutput.obj pbuilder_pbx.obj \
               borland_bmake.obj msvc_nmake.obj msvc_dsp.obj msvc_vcproj.obj \
               msvc_objectmodel.obj symmake.obj initprojectdeploy_symbian.obj \
-              symmake_abld.obj symmake_sbsv2.obj
+              symmake_abld.obj symmake_sbsv2.obj symbiancommon.obj
 
 !IFDEF QMAKE_OPENSOURCE_EDITION
 CFLAGS      = $(CFLAGS) -DQMAKE_OPENSOURCE_EDITION
@@ -197,6 +197,7 @@ clean::
 	-del symmake.obj
 	-del symmake_abld.obj
 	-del symmake_sbsv2.obj
+        -del symbiancommon.obj
 	-del initprojectdeploy_symbian.obj
 	-del pbuilder_pbx.obj
 	-del qxmlstream.obj
@@ -394,6 +395,9 @@ symmake_abld.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake_abld.cpp
 symmake_sbsv2.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp
 	$(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
 
+symbiancommon.obj: $(SOURCE_PATH)/qmake/generators/symbian/symbiancommon.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symbiancommon.cpp
+
 initprojectdeploy_symbian.obj: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
 	$(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
 
@@ -424,7 +428,7 @@ pbuilder_pbx.obj: $(SOURCE_PATH)/qmake/generators/mac/pbuilder_pbx.cpp
 makefiledeps.obj: $(SOURCE_PATH)/qmake/generators/makefiledeps.cpp
 	$(CXX) $(CXXFLAGS) generators/makefiledeps.cpp
 
-metamakefile.obj: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp
+metamakefile.obj: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp $(SOURCE_PATH)/qmake/generators/symbian/symbiancommon.obj
 	$(CXX) $(CXXFLAGS) generators/metamakefile.cpp
 
 xmloutput.obj: $(SOURCE_PATH)/qmake/generators/xmloutput.cpp
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index ade379b..1dacb68 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -38,7 +38,7 @@ OBJS        = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \
               makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
               borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \
               msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \
-              symmake_abld.o symmake_sbsv2.o
+              symmake_abld.o symmake_sbsv2.o symbiancommon.o
 
 ifdef QMAKE_OPENSOURCE_EDITION
 CFLAGS      += -DQMAKE_OPENSOURCE_EDITION
@@ -275,6 +275,9 @@ symmake_abld.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_abld.cpp
 symmake_sbsv2.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp
 	$(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
 
+symbiancommon.o: $(SOURCE_PATH)/qmake/generators/symbian/symbiancommon.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symbiancommon.cpp
+
 initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
 	$(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
 
@@ -302,7 +305,7 @@ pbuilder_pbx.o: $(SOURCE_PATH)/qmake/generators/mac/pbuilder_pbx.cpp
 makefiledeps.o: $(SOURCE_PATH)/qmake/generators/makefiledeps.cpp
 	$(CXX) $(CXXFLAGS) generators/makefiledeps.cpp
 
-metamakefile.o: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp
+metamakefile.o: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp $(SOURCE_PATH)/qmake/generators/symbian/symbian_makefile.h
 	$(CXX) $(CXXFLAGS) generators/metamakefile.cpp
 
 xmloutput.o: $(SOURCE_PATH)/qmake/generators/xmloutput.cpp
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh
index 8d2723c..bce414e 100644
--- a/qmake/Makefile.win32-g++-sh
+++ b/qmake/Makefile.win32-g++-sh
@@ -38,7 +38,7 @@ OBJS        = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \
               makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
               borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \
               msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \
-              symmake_abld.o symmake_sbsv2.o
+              symmake_abld.o symmake_sbsv2.o symbiancommon.o
 
 ifdef QMAKE_OPENSOURCE_EDITION
 CFLAGS      += -DQMAKE_OPENSOURCE_EDITION
@@ -274,6 +274,9 @@ symmake_abld.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_abld.cpp
 symmake_sbsv2.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp
 	$(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
 
+symbiancommon.o: $(SOURCE_PATH)/qmake/generators/symbian/symbiancommon.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/symbiancommon.cpp
+
 initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
 	$(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
 
@@ -301,7 +304,7 @@ pbuilder_pbx.o: $(SOURCE_PATH)/qmake/generators/mac/pbuilder_pbx.cpp
 makefiledeps.o: $(SOURCE_PATH)/qmake/generators/makefiledeps.cpp
 	$(CXX) $(CXXFLAGS) generators/makefiledeps.cpp
 
-metamakefile.o: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp
+metamakefile.o: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp $(SOURCE_PATH)/qmake/generators/symbian/symbian_makefile.h
 	$(CXX) $(CXXFLAGS) generators/metamakefile.cpp
 
 xmloutput.o: $(SOURCE_PATH)/qmake/generators/xmloutput.cpp
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index d89c3b1..0b3bdfa 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -248,6 +248,11 @@ public:
     virtual bool mergeBuildProject(MakefileGenerator * /*other*/) { return false; }
     virtual bool openOutput(QFile &, const QString &build) const;
     virtual bool isWindowsShell() const { return Option::target_mode == Option::TARG_WIN_MODE; }
+
+    // This is to avoid having SymbianCommonGenerator as a virtually inherited class
+    // of this class. Instead it is without a base class (avoiding the virtual
+    // inheritance problem), and is allowed to use functions defined in here.
+    friend class SymbianCommonGenerator;
 };
 
 inline void MakefileGenerator::setNoIO(bool o)
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index 4151193..54df7bc 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -436,6 +436,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
 #include "msvc_vcproj.h"
 #include "symmake_abld.h"
 #include "symmake_sbsv2.h"
+#include "symbian_makefile.h"
 QT_END_INCLUDE_NAMESPACE
 
 MakefileGenerator *
@@ -476,6 +477,8 @@ MetaMakefileGenerator::createMakefileGenerator(QMakeProject *proj, bool noIO)
         mkfile = new SymbianAbldMakefileGenerator;
     } else if(gen == "SYMBIAN_SBSV2") {
         mkfile = new SymbianSbsv2MakefileGenerator;
+    } else if(gen == "UNIX_SYMBIAN") {
+        mkfile = new SymbianMakefileTemplate<UnixMakefileGenerator>;
     } else {
         fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData());
     }
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
index a685b0f..efeaaae 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
@@ -239,6 +239,7 @@ void initProjectDeploySymbian(QMakeProject* project,
                               DeploymentList &deploymentList,
                               const QString &testPath,
                               bool deployBinaries,
+                              bool epocBuild,
                               const QString &platform,
                               const QString &build,
                               QStringList& generatedDirs,
@@ -321,7 +322,7 @@ void initProjectDeploySymbian(QMakeProject* project,
                 dirSearch = true;
             } else {
                 if (info.exists() || source.indexOf('*') != -1) {
-                    nameFilter = source.split('\\').last();
+                    nameFilter = source.split(QDir::separator()).last();
                     searchPath = info.absolutePath();
                 } else {
                     // Entry was not found. That is ok if it is a binary, since those do not necessarily yet exist.
@@ -329,12 +330,16 @@ void initProjectDeploySymbian(QMakeProject* project,
                     if (isBinary(info)) {
                         if (deployBinaries) {
                             // Executables and libraries are deployed to \sys\bin
-                            QFileInfo releasePath(epocRoot() + "epoc32\\release\\" + platform + "\\" + build + "\\");
+                            QFileInfo targetPath;
+                            if (epocBuild)
+                                targetPath.setFile(epocRoot() + "epoc32\\release\\" + platform + "\\" + build + "\\");
+                            else
+                                targetPath.setFile(info.path() + QDir::separator());
                             if(devicePathHasDriveLetter) {
-                                deploymentList.append(CopyItem(Option::fixPathToLocalOS(releasePath.absolutePath() + "\\" + info.fileName(), false, true),
+                                deploymentList.append(CopyItem(Option::fixPathToLocalOS(targetPath.absolutePath() + "\\" + info.fileName(), false, true),
                                                                Option::fixPathToLocalOS(devicePath.left(2) + QLatin1String(SYSBIN_DIR "\\") + info.fileName())));
                             } else {
-                                deploymentList.append(CopyItem(Option::fixPathToLocalOS(releasePath.absolutePath() + "\\" + info.fileName(), false, true),
+                                deploymentList.append(CopyItem(Option::fixPathToLocalOS(targetPath.absolutePath() + "\\" + info.fileName(), false, true),
                                                                Option::fixPathToLocalOS(deploymentDrive + QLatin1String(SYSBIN_DIR "\\") + info.fileName())));
                             }
                         }
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.h b/qmake/generators/symbian/initprojectdeploy_symbian.h
index e23e6a9..3c515d6 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.h
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.h
@@ -69,6 +69,7 @@ extern void initProjectDeploySymbian(QMakeProject* project,
                               DeploymentList &deploymentList,
                               const QString &testPath,
                               bool deployBinaries,
+                              bool epocBuild,
                               const QString &platform,
                               const QString &build,
                               QStringList& generatedDirs,
diff --git a/qmake/generators/symbian/symbian_makefile.h b/qmake/generators/symbian/symbian_makefile.h
new file mode 100644
index 0000000..91b3563
--- /dev/null
+++ b/qmake/generators/symbian/symbian_makefile.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the qmake application of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SYMBIAN_MAKEFILE_H
+#define SYMBIAN_MAKEFILE_H
+
+#include "symbiancommon.h"
+
+// This allows us to reuse the code for both win32 and unix makefile generators.
+template <class T>
+class SymbianMakefileTemplate : public T, public SymbianCommonGenerator
+{
+public:
+    SymbianMakefileTemplate() : SymbianCommonGenerator(this) {}
+
+    void init()
+    {
+        T::init();
+        SymbianCommonGenerator::init();
+    }
+
+    bool writeMakefile(QTextStream &t)
+    {
+        bool ret = T::writeMakefile(t);
+
+        QString iconFile;
+        DeploymentList depList;
+        generatePkgFile(iconFile, depList, false);
+
+        return ret;
+    }
+};
+
+#endif // SYMBIAN_MAKEFILE_H
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
new file mode 100644
index 0000000..a36e4be
--- /dev/null
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -0,0 +1,276 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the qmake application of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "symbiancommon.h"
+
+SymbianCommonGenerator::SymbianCommonGenerator(MakefileGenerator *generator)
+    : generator(generator)
+{
+}
+
+void SymbianCommonGenerator::init()
+{
+    QMakeProject *project = generator->project;
+    fixedTarget = generator->escapeFilePath(generator->fileFixify(project->first("TARGET")));
+    fixedTarget = removePathSeparators(fixedTarget);
+    removeSpecialCharacters(fixedTarget);
+
+    // This should not be empty since the mkspecs are supposed to set it if missing.
+    uid3 = project->first("TARGET.UID3").trimmed();
+
+    if ((project->values("TEMPLATE")).contains("app"))
+        targetType = TypeExe;
+    else if ((project->values("TEMPLATE")).contains("lib")) {
+        // Check CONFIG to see if we are to build staticlib or dll
+        if (project->values("CONFIG").contains("staticlib") || project->values("CONFIG").contains("static"))
+            targetType = TypeLib;
+        else if (project->values("CONFIG").contains("plugin"))
+            targetType = TypePlugin;
+        else
+            targetType = TypeDll;
+    } else {
+        targetType = TypeSubdirs;
+    }
+
+    // UID is valid as either hex or decimal, so just convert it to number and back to hex
+    // to get proper string for private dir
+    bool conversionOk = false;
+    uint uidNum = uid3.toUInt(&conversionOk, 0);
+
+    if (!conversionOk) {
+        fprintf(stderr, "Error: Invalid UID \"%s\".\n", uid3.toUtf8().constData());
+    } else {
+        privateDirUid.setNum(uidNum, 16);
+        while (privateDirUid.length() < 8)
+            privateDirUid.insert(0, QLatin1Char('0'));
+    }
+}
+
+bool SymbianCommonGenerator::containsStartWithItem(const QChar &c, const QStringList& src)
+{
+    bool result = false;
+    foreach(QString str, src) {
+        if (str.startsWith(c)) {
+            result =  true;
+            break;
+        }
+    }
+    return result;
+}
+
+void SymbianCommonGenerator::removeSpecialCharacters(QString& str)
+{
+    // When modifying this method check also application_icon.prf
+    str.replace(QString("/"), QString("_"));
+    str.replace(QString("\\"), QString("_"));
+    str.replace(QString("-"), QString("_"));
+    str.replace(QString(":"), QString("_"));
+    str.replace(QString("."), QString("_"));
+    str.replace(QString(" "), QString("_"));
+}
+
+void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, DeploymentList &depList, bool epocBuild)
+{
+    QMakeProject *project = generator->project;
+    QString pkgFilename = QString("%1_template.%2")
+                          .arg(fixedTarget)
+                          .arg("pkg");
+    QFile pkgFile(pkgFilename);
+    if (!pkgFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        PRINT_FILE_CREATE_ERROR(pkgFilename);
+        return;
+    }
+
+    generatedFiles << pkgFile.fileName();
+
+    // Header info
+    QTextStream t(&pkgFile);
+    t << QString("; %1 generated by qmake at %2").arg(pkgFilename).arg(QDateTime::currentDateTime().toString(Qt::ISODate))  << endl;
+    t << "; This file is generated by qmake and should not be modified by the user" << endl;
+    t << ";" << endl << endl;
+
+    // Construct QStringList from pkg_prerules since we need search it before printed to file
+    QStringList rawPkgPreRules;
+    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {
+        foreach(QString pkgrulesItem, project->values(deploymentItem + ".pkg_prerules")) {
+            QStringList pkgrulesValue = project->values(pkgrulesItem);
+            // If there is no stringlist defined for a rule, use rule name directly
+            // This is convenience for defining single line mmp statements
+            if (pkgrulesValue.isEmpty()) {
+                rawPkgPreRules << pkgrulesItem;
+            } else {
+                foreach(QString pkgrule, pkgrulesValue) {
+                    rawPkgPreRules << pkgrule;
+                }
+            }
+        }
+    }
+
+    // Apply some defaults if specific data does not exist in PKG pre-rules
+
+    if (!containsStartWithItem('&', rawPkgPreRules)) {
+        // language, (*** hardcoded to english atm, should be parsed from TRANSLATIONS)
+        t << "; Language" << endl;
+        t << "&EN" << endl << endl;
+    } else {
+        // In case user defines langs, he must take care also about SIS header
+        if (!containsStartWithItem('#', rawPkgPreRules))
+            fprintf(stderr, "Warning: If language is defined with DEPLOYMENT pkg_prerules, also the SIS header must be defined\n");
+    }
+
+    // name of application, UID and version
+    QString applicationVersion = project->first("VERSION").isEmpty() ? "1,0,0" : project->first("VERSION").replace('.', ',');
+
+    if (!containsStartWithItem('#', rawPkgPreRules)) {
+        QString visualTarget = generator->escapeFilePath(generator->fileFixify(project->first("TARGET")));
+        visualTarget = removePathSeparators(visualTarget);
+
+        t << "; SIS header: name, uid, version" << endl;
+        t << QString("#{\"%1\"},(%2),%3").arg(visualTarget).arg(uid3).arg(applicationVersion) << endl << endl;
+    }
+
+    // Localized vendor name
+    if (!containsStartWithItem('%', rawPkgPreRules)) {
+        t << "; Localised Vendor name" << endl;
+        t << "%{\"Vendor\"}" << endl << endl;
+    }
+
+    // Unique vendor name
+    if (!containsStartWithItem(':', rawPkgPreRules)) {
+        t << "; Unique Vendor name" << endl;
+        t << ":\"Vendor\"" << endl << endl;
+    }
+
+    // PKG pre-rules - these are added before actual file installations i.e. SIS package body
+    if (rawPkgPreRules.size()) {
+        t << "; Manual PKG pre-rules from PRO files" << endl;
+        foreach(QString item, rawPkgPreRules) {
+            t << item << endl;
+        }
+        t << endl;
+    }
+
+    // Install paths on the phone *** should be dynamic at some point
+    QString installPathBin = "!:\\sys\\bin";
+    QString installPathResource = "!:\\resource\\apps";
+    QString installPathRegResource = "!:\\private\\10003a3f\\import\\apps";
+
+    // Find location of builds
+    QString epocReleasePath = QString("%1epoc32/release/$(PLATFORM)/$(TARGET)")
+                              .arg(epocRoot());
+
+
+    if (targetType == TypeExe) {
+        // deploy .exe file
+        t << "; Executable and default resource files" << endl;
+        QString exeFile = fixedTarget + ".exe";
+        t << QString("\"%1/%2\"    - \"%3\\%4\"")
+             .arg(epocReleasePath)
+             .arg(exeFile)
+             .arg(installPathBin)
+             .arg(exeFile) << endl;
+
+        // deploy rsc & reg_rsc file
+        if (!project->values("CONFIG").contains("no_icon", Qt::CaseInsensitive)) {
+            t << QString("\"%1epoc32/data/z/resource/apps/%2\"    - \"%3\\%4\"")
+                 .arg(epocRoot())
+                 .arg(fixedTarget + ".rsc")
+                 .arg(installPathResource)
+                 .arg(fixedTarget + ".rsc") << endl;
+
+            t << QString("\"%1epoc32/data/z/private/10003a3f/import/apps/%2\"    - \"%3\\%4\"")
+                 .arg(epocRoot())
+                 .arg(fixedTarget + "_reg.rsc")
+                 .arg(installPathRegResource)
+                 .arg(fixedTarget + "_reg.rsc") << endl;
+
+            if (!iconFile.isEmpty())  {
+                t << QString("\"%1epoc32/data/z%2\"    - \"!:%3\"")
+                     .arg(epocRoot())
+                     .arg(iconFile)
+                     .arg(QDir::toNativeSeparators(iconFile)) << endl << endl;
+            }
+        }
+    }
+
+    // deploy any additional DEPLOYMENT  files
+    QString remoteTestPath;
+    remoteTestPath = QString("!:\\private\\%1").arg(privateDirUid);
+
+    initProjectDeploySymbian(project, depList, remoteTestPath, true, epocBuild, "$(PLATFORM)", "$(TARGET)", generatedDirs, generatedFiles);
+    if (depList.size())
+        t << "; DEPLOYMENT" << endl;
+    for (int i = 0; i < depList.size(); ++i)  {
+        t << QString("\"%1\"    - \"%2\"")
+             .arg(QString(depList.at(i).from).replace('\\','/'))
+             .arg(depList.at(i).to) << endl;
+    }
+    t << endl;
+
+    // PKG post-rules - these are added after actual file installations i.e. SIS package body
+    t << "; Manual PKG post-rules from PRO files" << endl;
+    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {
+        foreach(QString pkgrulesItem, project->values(deploymentItem + ".pkg_postrules")) {
+            QStringList pkgrulesValue = project->values(pkgrulesItem);
+            // If there is no stringlist defined for a rule, use rule name directly
+            // This is convenience for defining single line statements
+            if (pkgrulesValue.isEmpty()) {
+                t << pkgrulesItem << endl;
+            } else {
+                foreach(QString pkgrule, pkgrulesValue) {
+                    t << pkgrule << endl;
+                }
+            }
+            t << endl;
+        }
+    }
+}
+
+QString SymbianCommonGenerator::removePathSeparators(QString &file)
+{
+    QString ret = file;
+    while (ret.indexOf(QDir::separator()) > 0) {
+        ret.remove(0, ret.indexOf(QDir::separator()) + 1);
+    }
+
+    return ret;
+}
+
diff --git a/qmake/generators/symbian/symbiancommon.h b/qmake/generators/symbian/symbiancommon.h
new file mode 100644
index 0000000..abe6d51
--- /dev/null
+++ b/qmake/generators/symbian/symbiancommon.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the qmake application of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SYMBIANCOMMON_H
+#define SYMBIANCOMMON_H
+
+#include <project.h>
+#include <makefile.h>
+#include "initprojectdeploy_symbian.h"
+
+#define PRINT_FILE_CREATE_ERROR(filename) fprintf(stderr, "Error: Could not create '%s'\n", qPrintable(filename));
+
+class SymbianCommonGenerator
+{
+public:
+    enum TargetType {
+        TypeExe,
+        TypeDll,
+        TypeLib,
+        TypePlugin,
+        TypeSubdirs
+    };
+
+    SymbianCommonGenerator(MakefileGenerator *generator);
+
+    virtual void init();
+
+    QString removePathSeparators(QString &file);
+    void removeSpecialCharacters(QString& str);
+    void generatePkgFile(const QString &iconFile, DeploymentList &depList, bool epocBuild);
+    bool containsStartWithItem(const QChar &c, const QStringList& src);
+
+protected:
+    MakefileGenerator *generator;
+
+    QStringList generatedFiles;
+    QStringList generatedDirs;
+    QString fixedTarget;
+    QString privateDirUid;
+    QString uid3;
+    TargetType targetType;
+};
+
+#endif // SYMBIANCOMMON_H
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index 20e2d0e..38b6cad 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -92,8 +92,6 @@
 #define FAIL_SIS_NOPKG_TARGET "fail_sis_nopkg"
 #define FAIL_SIS_NOCACHE_TARGET "fail_sis_nocache"
 
-#define PRINT_FILE_CREATE_ERROR(filename) fprintf(stderr, "Error: Could not create '%s'\n", qPrintable(filename));
-
 QString SymbianMakefileGenerator::fixPathForMmp(const QString& origPath, const QDir& parentDir)
 {
     static QString epocRootStr;
@@ -156,7 +154,7 @@ QString SymbianMakefileGenerator::canonizePath(const QString& origPath)
     return resultPath;
 }
 
-SymbianMakefileGenerator::SymbianMakefileGenerator() : MakefileGenerator() { }
+SymbianMakefileGenerator::SymbianMakefileGenerator() : MakefileGenerator(), SymbianCommonGenerator(this) { }
 SymbianMakefileGenerator::~SymbianMakefileGenerator() { }
 
 void SymbianMakefileGenerator::writeHeader(QTextStream &t)
@@ -216,7 +214,7 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
     }
 
     if (generatePkg) {
-        generatePkgFile(iconFile, depList);
+        generatePkgFile(iconFile, depList, true);
     }
 
     writeBldInfContent(t, generatePkg, iconFile, depList);
@@ -274,174 +272,6 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
     return true;
 }
 
-void SymbianMakefileGenerator::generatePkgFile(const QString &iconFile, DeploymentList &depList)
-{
-    QString pkgFilename = QString("%1_template.%2")
-                          .arg(fixedTarget)
-                          .arg("pkg");
-    QFile pkgFile(pkgFilename);
-    if (!pkgFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        PRINT_FILE_CREATE_ERROR(pkgFilename);
-        return;
-    }
-
-    generatedFiles << pkgFile.fileName();
-
-    // Header info
-    QTextStream t(&pkgFile);
-    t << QString("; %1 generated by qmake at %2").arg(pkgFilename).arg(QDateTime::currentDateTime().toString(Qt::ISODate))  << endl;
-    t << "; This file is generated by qmake and should not be modified by the user" << endl;
-    t << ";" << endl << endl;
-
-    // Construct QStringList from pkg_prerules since we need search it before printed to file
-    QStringList rawPkgPreRules;
-    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {
-        foreach(QString pkgrulesItem, project->values(deploymentItem + ".pkg_prerules")) {
-            QStringList pkgrulesValue = project->values(pkgrulesItem);
-            // If there is no stringlist defined for a rule, use rule name directly
-            // This is convenience for defining single line mmp statements
-            if (pkgrulesValue.isEmpty()) {
-                rawPkgPreRules << pkgrulesItem;
-            } else {
-                foreach(QString pkgrule, pkgrulesValue) {
-                    rawPkgPreRules << pkgrule;
-                }
-            }
-        }
-    }
-
-    // Apply some defaults if specific data does not exist in PKG pre-rules
-
-    if (!containsStartWithItem('&', rawPkgPreRules)) {
-        // language, (*** hardcoded to english atm, should be parsed from TRANSLATIONS)
-        t << "; Language" << endl;
-        t << "&EN" << endl << endl;
-    } else {
-        // In case user defines langs, he must take care also about SIS header
-        if (!containsStartWithItem('#', rawPkgPreRules))
-            fprintf(stderr, "Warning: If language is defined with DEPLOYMENT pkg_prerules, also the SIS header must be defined\n");
-    }
-
-    // name of application, UID and version
-    QString applicationVersion = project->first("VERSION").isEmpty() ? "1,0,0" : project->first("VERSION").replace('.', ',');
-
-    if (!containsStartWithItem('#', rawPkgPreRules)) {
-        QString visualTarget = escapeFilePath(fileFixify(project->first("TARGET")));
-        visualTarget = removePathSeparators(visualTarget);
-
-        t << "; SIS header: name, uid, version" << endl;
-        t << QString("#{\"%1\"},(%2),%3").arg(visualTarget).arg(uid3).arg(applicationVersion) << endl << endl;
-    }
-
-    // Localized vendor name
-    if (!containsStartWithItem('%', rawPkgPreRules)) {
-        t << "; Localised Vendor name" << endl;
-        t << "%{\"Vendor\"}" << endl << endl;
-    }
-
-    // Unique vendor name
-    if (!containsStartWithItem(':', rawPkgPreRules)) {
-        t << "; Unique Vendor name" << endl;
-        t << ":\"Vendor\"" << endl << endl;
-    }
-
-    // PKG pre-rules - these are added before actual file installations i.e. SIS package body
-    if (rawPkgPreRules.size()) {
-        t << "; Manual PKG pre-rules from PRO files" << endl;
-        foreach(QString item, rawPkgPreRules) {
-            t << item << endl;
-        }
-        t << endl;
-    }
-
-    // Install paths on the phone *** should be dynamic at some point
-    QString installPathBin = "!:\\sys\\bin";
-    QString installPathResource = "!:\\resource\\apps";
-    QString installPathRegResource = "!:\\private\\10003a3f\\import\\apps";
-
-    // Find location of builds
-    QString epocReleasePath = QString("%1epoc32/release/$(PLATFORM)/$(TARGET)")
-                              .arg(epocRoot());
-
-
-    if (targetType == TypeExe) {
-        // deploy .exe file
-        t << "; Executable and default resource files" << endl;
-        QString exeFile = fixedTarget + ".exe";
-        t << QString("\"%1/%2\"    - \"%3\\%4\"")
-             .arg(epocReleasePath)
-             .arg(exeFile)
-             .arg(installPathBin)
-             .arg(exeFile) << endl;
-
-        // deploy rsc & reg_rsc file
-        if (!project->values("CONFIG").contains("no_icon", Qt::CaseInsensitive)) {
-            t << QString("\"%1epoc32/data/z/resource/apps/%2\"    - \"%3\\%4\"")
-                 .arg(epocRoot())
-                 .arg(fixedTarget + ".rsc")
-                 .arg(installPathResource)
-                 .arg(fixedTarget + ".rsc") << endl;
-
-            t << QString("\"%1epoc32/data/z/private/10003a3f/import/apps/%2\"    - \"%3\\%4\"")
-                 .arg(epocRoot())
-                 .arg(fixedTarget + "_reg.rsc")
-                 .arg(installPathRegResource)
-                 .arg(fixedTarget + "_reg.rsc") << endl;
-
-            if (!iconFile.isEmpty())  {
-                t << QString("\"%1epoc32/data/z%2\"    - \"!:%3\"")
-                     .arg(epocRoot())
-                     .arg(iconFile)
-                     .arg(QDir::toNativeSeparators(iconFile)) << endl << endl;
-            }
-        }
-    }
-
-    // deploy any additional DEPLOYMENT  files
-    QString remoteTestPath;
-    remoteTestPath = QString("!:\\private\\%1").arg(privateDirUid);
-
-    initProjectDeploySymbian(project, depList, remoteTestPath, true, "$(PLATFORM)", "$(TARGET)", generatedDirs, generatedFiles);
-    if (depList.size())
-        t << "; DEPLOYMENT" << endl;
-    for (int i = 0; i < depList.size(); ++i)  {
-        t << QString("\"%1\"    - \"%2\"")
-             .arg(QString(depList.at(i).from).replace('\\','/'))
-             .arg(depList.at(i).to) << endl;
-    }
-    t << endl;
-
-    // PKG post-rules - these are added after actual file installations i.e. SIS package body
-    t << "; Manual PKG post-rules from PRO files" << endl;
-    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {
-        foreach(QString pkgrulesItem, project->values(deploymentItem + ".pkg_postrules")) {
-            QStringList pkgrulesValue = project->values(pkgrulesItem);
-            // If there is no stringlist defined for a rule, use rule name directly
-            // This is convenience for defining single line statements
-            if (pkgrulesValue.isEmpty()) {
-                t << pkgrulesItem << endl;
-            } else {
-                foreach(QString pkgrule, pkgrulesValue) {
-                    t << pkgrule << endl;
-                }
-            }
-            t << endl;
-        }
-    }
-}
-
-bool SymbianMakefileGenerator::containsStartWithItem(const QChar &c, const QStringList& src)
-{
-    bool result = false;
-    foreach(QString str, src) {
-        if (str.startsWith(c)) {
-            result =  true;
-            break;
-        }
-    }
-    return result;
-}
-
 void SymbianMakefileGenerator::writeCustomDefFile()
 {
     if (targetType == TypePlugin && !project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive)) {
@@ -479,9 +309,7 @@ void SymbianMakefileGenerator::writeCustomDefFile()
 void SymbianMakefileGenerator::init()
 {
     MakefileGenerator::init();
-    fixedTarget = escapeFilePath(fileFixify(project->first("TARGET")));
-    fixedTarget = removePathSeparators(fixedTarget);
-    removeSpecialCharacters(fixedTarget);
+    SymbianCommonGenerator::init();
 
     if (0 != project->values("QMAKE_PLATFORM").size())
         platform = varGlue("QMAKE_PLATFORM", "", " ", "");
@@ -498,27 +326,6 @@ void SymbianMakefileGenerator::init()
     // .mmp
     initMmpVariables();
 
-    // Check TARGET.UID3 presence
-    if (0 != project->values("TARGET.UID3").size()) {
-        uid3 = project->first("TARGET.UID3");
-    } else {
-        uid3 = generateUID3();
-    }
-
-    if ((project->values("TEMPLATE")).contains("app"))
-        targetType = TypeExe;
-    else if ((project->values("TEMPLATE")).contains("lib")) {
-        // Check CONFIG to see if we are to build staticlib or dll
-        if (project->values("CONFIG").contains("staticlib") || project->values("CONFIG").contains("static"))
-            targetType = TypeLib;
-        else if (project->values("CONFIG").contains("plugin"))
-            targetType = TypePlugin;
-        else
-            targetType = TypeDll;
-    } else {
-        targetType = TypeSubdirs;
-    }
-
     if (0 != project->values("TARGET.UID2").size()) {
         uid2 = project->first("TARGET.UID2");
     } else if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive)) {
@@ -538,20 +345,6 @@ void SymbianMakefileGenerator::init()
     }
 
     uid2 = uid2.trimmed();
-    uid3 = uid3.trimmed();
-
-    // UID is valid as either hex or decimal, so just convert it to number and back to hex
-    // to get proper string for private dir
-    bool conversionOk = false;
-    uint uidNum = uid3.toUInt(&conversionOk, 0);
-
-    if (!conversionOk) {
-        fprintf(stderr, "Error: Invalid UID \"%s\".\n", uid3.toUtf8().constData());
-    } else {
-        privateDirUid.setNum(uidNum, 16);
-        while (privateDirUid.length() < 8)
-            privateDirUid.insert(0, QLatin1Char('0'));
-    }
 }
 
 QString SymbianMakefileGenerator::getTargetExtension()
@@ -1727,16 +1520,6 @@ void SymbianMakefileGenerator::appendIfnotExist(QStringList &list, QStringList v
         appendIfnotExist(list, item);
 }
 
-QString SymbianMakefileGenerator::removePathSeparators(QString &file)
-{
-    QString ret = file;
-    while (ret.indexOf(QDir::separator()) > 0) {
-        ret.remove(0, ret.indexOf(QDir::separator()) + 1);
-    }
-
-    return ret;
-}
-
 
 QString SymbianMakefileGenerator::removeTrailingPathSeparators(QString &file)
 {
@@ -1768,17 +1551,6 @@ void SymbianMakefileGenerator::generateCleanCommands(QTextStream& t,
     }
 }
 
-void SymbianMakefileGenerator::removeSpecialCharacters(QString& str)
-{
-    // When modifying this method check also application_icon.prf
-    str.replace(QString("/"), QString("_"));
-    str.replace(QString("\\"), QString("_"));
-    str.replace(QString("-"), QString("_"));
-    str.replace(QString(":"), QString("_"));
-    str.replace(QString("."), QString("_"));
-    str.replace(QString(" "), QString("_"));
-}
-
 void SymbianMakefileGenerator::writeSisTargets(QTextStream &t)
 {
     t << "-include " MAKE_CACHE_NAME << endl;
diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h
index 77d61da..46071b8 100644
--- a/qmake/generators/symbian/symmake.h
+++ b/qmake/generators/symbian/symmake.h
@@ -43,6 +43,7 @@
 #define SYMMAKEFILE_H
 
 #include "initprojectdeploy_symbian.h"
+#include "symbiancommon.h"
 #include <makefile.h>
 
 QT_BEGIN_NAMESPACE
@@ -53,22 +54,11 @@ QT_BEGIN_NAMESPACE
 #define QT_EXTRA_INCLUDE_DIR "tmp"
 #define MAKE_CACHE_NAME ".make.cache"
 
-class SymbianMakefileGenerator : public MakefileGenerator
+class SymbianMakefileGenerator : public MakefileGenerator, public SymbianCommonGenerator
 {
 protected:
-    enum TargetType {
-        TypeExe,
-        TypeDll,
-        TypeLib,
-        TypePlugin,
-        TypeSubdirs
-    };
-
     QString platform;
     QString uid2;
-    QString uid3;
-    QString privateDirUid;
-    TargetType targetType;
     QMap<QString, QStringList> sources;
     QMap<QString, QStringList> systeminclude;
     QMap<QString, QStringList> library;
@@ -76,19 +66,12 @@ protected:
     QMap<QString, QStringList> makmakeCommands;
     QStringList overriddenMmpKeywords;
 
-    QStringList generatedFiles;
-    QStringList generatedDirs;
     QHash<QString, QString> qt2S60LangMapTable;
 
-    QString fixedTarget;
-
-    void removeSpecialCharacters(QString& str);
     QString fixPathForMmp(const QString& origPath, const QDir& parentDir);
     QString canonizePath(const QString& origPath);
 
     virtual bool writeMakefile(QTextStream &t);
-    void generatePkgFile(const QString &iconFile, DeploymentList &depList);
-    bool containsStartWithItem(const QChar &c, const QStringList& src);
 
     virtual void init();
 
@@ -138,7 +121,6 @@ protected:
     void appendIfnotExist(QStringList &list, QString value);
     void appendIfnotExist(QStringList &list, QStringList values);
 
-    QString removePathSeparators(QString &file);
     QString removeTrailingPathSeparators(QString &file);
     void generateCleanCommands(QTextStream& t,
                                const QStringList& toClean,
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index d1e63cb..0b6f749 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -410,7 +410,7 @@ bool SymbianAbldMakefileGenerator::writeDeploymentTargets(QTextStream &t)
 
     QString remoteTestPath = epocRoot() + QLatin1String("epoc32\\winscw\\c\\private\\") + privateDirUid;   // default 4 OpenC; 4 all Symbian too
     DeploymentList depList;
-    initProjectDeploySymbian(project, depList, remoteTestPath, false, QLatin1String("winscw"), QLatin1String("udeb"), generatedDirs, generatedFiles);
+    initProjectDeploySymbian(project, depList, remoteTestPath, false, true, QLatin1String("winscw"), QLatin1String("udeb"), generatedDirs, generatedFiles);
 
     if (depList.size())
         t << "\t-echo Deploying changed files..." << endl;
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index 5adf30d..261a158 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -365,7 +365,7 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
     // Write winscw deployment rules
     QString remoteTestPath = epocRoot() + QLatin1String("epoc32/winscw/c/private/") + privateDirUid;
     DeploymentList depList;
-    initProjectDeploySymbian(project, depList, remoteTestPath, false, QLatin1String("winscw"), QLatin1String("udeb"), generatedDirs, generatedFiles);
+    initProjectDeploySymbian(project, depList, remoteTestPath, false, true, QLatin1String("winscw"), QLatin1String("udeb"), generatedDirs, generatedFiles);
 
     t << "#if defined(WINSCW)" << endl;
     for (int i = 0; i < depList.size(); ++i) {
diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h
index 77bdd01..0ea3350 100644
--- a/qmake/generators/unix/unixmake.h
+++ b/qmake/generators/unix/unixmake.h
@@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE
 class UnixMakefileGenerator : public MakefileGenerator
 {
     bool init_flag, include_deps;
-    bool writeMakefile(QTextStream &);
     QString libtoolFileName(bool fixify=true);
     void writeLibtoolFile();     // for libtool
     QString pkgConfigPrefix() const;
@@ -75,6 +74,7 @@ protected:
     virtual void init();
 
     void writeMakeParts(QTextStream &);
+    bool writeMakefile(QTextStream &);
 
 private:
     void init2();