Changeset 651 for trunk/qmake/generators/symbian/symmake.h

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• qmake/generators/symbian/symmake.h (modified) (4 diffs)

trunk/qmake/generators/symbian/symmake.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -43 +43 @@
 #define SYMMAKEFILE_H
 
+#include "initprojectdeploy_symbian.h"
 #include <makefile.h>
 
@@ -87 +88 @@
 
     virtual bool writeMakefile(QTextStream &t);
-    void generatePkgFile(const QString &iconFile);
+    void generatePkgFile(const QString &iconFile, DeploymentList &depList);
     bool containsStartWithItem(const QChar &c, const QStringList& src);
 
@@ -107 +108 @@
 
     void writeHeader(QTextStream &t);
-    void writeBldInfContent(QTextStream& t, bool addDeploymentExtension, const QString &iconFile);
+    void writeBldInfContent(QTextStream& t, bool addDeploymentExtension, const QString &iconFile, DeploymentList &depList);
 
     static bool removeDuplicatedStrings(QStringList& stringList);