summaryrefslogtreecommitdiffstats
path: root/qmake/generators/symbian/symmake_sbsv2.h
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-11-18 12:47:42 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-11-18 12:51:33 (GMT)
commit952f0ca3f371b040bd8b8a007cdf87bf0e4843ad (patch)
tree160a0cebc40e81dab6ef5bf8ed318fca42e7ac5e /qmake/generators/symbian/symmake_sbsv2.h
parent70b121ca310c99269bb08161000215f09b41a84b (diff)
downloadQt-952f0ca3f371b040bd8b8a007cdf87bf0e4843ad.zip
Qt-952f0ca3f371b040bd8b8a007cdf87bf0e4843ad.tar.gz
Qt-952f0ca3f371b040bd8b8a007cdf87bf0e4843ad.tar.bz2
Changed MIF filename from UID to target name in Symbian.
This change makes it possible to define ICON keyword in pro file without UID3. It is safe to use target as an icon name since Symbian devices cannot have two different binaries with the same name as all binaries are located in \sys\bin. This means there cannot be also two mif files with same target name. Also all native S60 apps use target name as an MIF basename. Target name is also much easier to associate with app than UID. Task-number: QTBUG-4677 Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'qmake/generators/symbian/symmake_sbsv2.h')
-rw-r--r--qmake/generators/symbian/symmake_sbsv2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake_sbsv2.h b/qmake/generators/symbian/symmake_sbsv2.h
index 9472b68..3394908 100644
--- a/qmake/generators/symbian/symmake_sbsv2.h
+++ b/qmake/generators/symbian/symmake_sbsv2.h
@@ -51,7 +51,7 @@ class SymbianSbsv2MakefileGenerator : public SymbianMakefileGenerator
protected:
// Inherited from parent
- virtual void writeBldInfExtensionRulesPart(QTextStream& t);
+ virtual void writeBldInfExtensionRulesPart(QTextStream& t, const QString &iconTargetFile);
virtual void writeBldInfMkFilePart(QTextStream& t, bool addDeploymentExtension);
virtual void writeMkFile(const QString& wrapperFileName, bool deploymentOnly);
virtual void writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile);