diff options
author | Thomas Zander <t.zander@nokia.com> | 2010-03-31 12:08:09 (GMT) |
---|---|---|
committer | Thomas Zander <t.zander@nokia.com> | 2010-03-31 12:08:09 (GMT) |
commit | 56949fc36c30a84e716b66ac74f3a0a8de74cc8e (patch) | |
tree | dbb5b05f4549c829dd1fc2295e75bad0662598d9 /qmake/generators/symbian/symmake.cpp | |
parent | b75ebb19032ab2b739c848ed1e8cc1fa74f3cd21 (diff) | |
download | Qt-56949fc36c30a84e716b66ac74f3a0a8de74cc8e.zip Qt-56949fc36c30a84e716b66ac74f3a0a8de74cc8e.tar.gz Qt-56949fc36c30a84e716b66ac74f3a0a8de74cc8e.tar.bz2 |
Cleanup the deployment code
Remove local defines and passing of a list while its never used, only define
it where its actually used.
Diffstat (limited to 'qmake/generators/symbian/symmake.cpp')
-rw-r--r-- | qmake/generators/symbian/symmake.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index 0fcd26d..e05ced2 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -187,7 +187,6 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t) // Generate pkg files if there are any actual files to deploy bool generatePkg = false; - DeploymentList depList; if (targetType == TypeExe) { generatePkg = true; @@ -201,10 +200,10 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t) } if (generatePkg) { - generatePkgFile(iconFile, depList, true); + generatePkgFile(iconFile, true); } - writeBldInfContent(t, generatePkg, iconFile, depList); + writeBldInfContent(t, generatePkg, iconFile); // Generate empty wrapper makefile here, because wrapper makefile must exist before writeMkFile, // but all required data is not yet available. @@ -948,7 +947,7 @@ void SymbianMakefileGenerator::writeMmpFileRulesPart(QTextStream& t) } } -void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploymentExtension, const QString &iconFile, DeploymentList &depList) +void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploymentExtension, const QString &iconFile) { // Read user defined bld inf rules |