diff options
author | axis <qt-info@nokia.com> | 2010-02-22 09:40:58 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2010-02-22 09:40:58 (GMT) |
commit | a31e40295d5f6e4bc54f8831ca0d0303e4b066d4 (patch) | |
tree | 3df4c8b82df298f4dd8848d948d52dcfead17d73 /qmake/generators/symbian | |
parent | deb7ea0ff336487315fe0278a8f6bfedd482e651 (diff) | |
download | Qt-a31e40295d5f6e4bc54f8831ca0d0303e4b066d4.zip Qt-a31e40295d5f6e4bc54f8831ca0d0303e4b066d4.tar.gz Qt-a31e40295d5f6e4bc54f8831ca0d0303e4b066d4.tar.bz2 |
Prevented pkg generation unless there are files to deploy.
Diffstat (limited to 'qmake/generators/symbian')
-rw-r--r-- | qmake/generators/symbian/symbian_makefile.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symbian_makefile.h b/qmake/generators/symbian/symbian_makefile.h index 532ab89..0f2e29a 100644 --- a/qmake/generators/symbian/symbian_makefile.h +++ b/qmake/generators/symbian/symbian_makefile.h @@ -64,8 +64,24 @@ public: QStringList userRssRules; readRssRules(numberOfIcons, iconFile, userRssRules); + // Generate pkg files if there are any actual files to deploy + bool generatePkg = false; DeploymentList depList; - generatePkgFile(iconFile, depList, false); + + if (targetType == TypeExe) { + generatePkg = true; + } else { + foreach(QString item, this->project->values("DEPLOYMENT")) { + if (!this->project->values(item + ".sources").isEmpty()) { + generatePkg = true; + break; + } + } + } + + if (generatePkg) { + generatePkgFile(iconFile, depList, true); + } // Get the application translations and convert to symbian OS lang code, i.e. decical number QStringList symbianLangCodes = symbianLangCodesFromTsFiles(); |