--- a/qmake/generators/symbian/symmake.h	Wed Jun 23 19:07:03 2010 +0300
+++ b/qmake/generators/symbian/symmake.h	Tue Jul 06 15:10:48 2010 +0300
@@ -43,6 +43,7 @@
 #define SYMMAKEFILE_H
 
 #include "initprojectdeploy_symbian.h"
+#include "symbiancommon.h"
 #include <makefile.h>
 
 QT_BEGIN_NAMESPACE
@@ -53,22 +54,11 @@
 #define MAKE_CACHE_NAME ".make.cache"
 #define SYMBIAN_TEST_CONFIG "symbian_test"
 
-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,20 +66,10 @@
     QMap<QString, QStringList> makmakeCommands;
     QStringList overriddenMmpKeywords;
 
-    QStringList generatedFiles;
-    QStringList generatedDirs;
-    QHash<QString, QString> qt2S60LangMapTable;
-
-    QString fixedTarget;
-	QString translationFileName; 
-		
-    void removeSpecialCharacters(QString& str);
     QString fixPathForMmp(const QString& origPath, const QDir& parentDir);
     QString absolutizePath(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();
 
@@ -110,8 +90,7 @@
     void writeHeader(QTextStream &t);
     void writeBldInfContent(QTextStream& t,
                             bool addDeploymentExtension,
-                            const QString &iconFile,
-                            DeploymentList &depList);
+                            const QString &iconFile);
 
     static bool removeDuplicatedStrings(QStringList& stringList);
 
@@ -140,25 +119,9 @@
 
     void writeCustomDefFile();
 
-    void writeRegRssFile(QMap<QString, QStringList> &useritems);
-    void writeRegRssList(QTextStream &t, QStringList &userList,
-                         const QString &listTag,
-                         const QString &listItem);
-    void writeRssFile(QString &numberOfIcons, QString &iconfile);
-    void writeLocFile(QStringList &symbianLangCodes);
-    void writeSymbianLocFile(QStringList &symbianLangCodes);
-    void readRssRules(QString &numberOfIcons,
-                      QString &iconFile,
-                      QMap<QString, QStringList> &userRssRules);
-
-    QStringList symbianLangCodesFromTsFiles();
-    void fillQt2S60LangMapTable();
-    void modifyQt2S60LangMapTable();
-
     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,
@@ -167,7 +130,6 @@
                                const QString& itemPrefix,
                                const QString& itemSuffix);
 
-    void writeSisTargets(QTextStream &t);
     void generateDistcleanTargets(QTextStream& t);
     void generateExecutionTargets(QTextStream& t, const QStringList& platforms);