summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-08-26 12:30:59 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-08-26 13:06:33 (GMT)
commit26103b69df9bdd32016f3fbab975a26c8a147ea0 (patch)
treee5a791a72796343bb845bf72d30d821e364ba4bf /qmake/generators
parent4fdb6a01b35d9cd4dc9e5e4d6682449476d68375 (diff)
downloadQt-26103b69df9bdd32016f3fbab975a26c8a147ea0.zip
Qt-26103b69df9bdd32016f3fbab975a26c8a147ea0.tar.gz
Qt-26103b69df9bdd32016f3fbab975a26c8a147ea0.tar.bz2
Added support for DEPLOYMENT.pkg_build_version
DEPLOYMENT.pkg_build_version can be used to pad the patch version number in Symbian pkg files to allow hot-fix deployments to be done between patch releases. DEPLOYMENT.pkg_build_version accepts only values 0 - 99, as pkg patch version number has limits how large numbers it can accept. The specified number is prefixed with zero if it is single digit and then appended to patch version number. Task-number: QTBUG-13147 Reviewed-by: Janne Koskinen
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/symbian/symbiancommon.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index d124b02..155dbc9 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -275,6 +275,20 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB
if (success)
applicationVersion = QString("%1,%2,%3").arg(major).arg(minor).arg(patch);
+ // Append package build version number if it is set
+ QString pkgBuildVersion = project->first("DEPLOYMENT.pkg_build_version");
+ if (!pkgBuildVersion.isEmpty()) {
+ success = false;
+ uint build = pkgBuildVersion.toUInt(&success);
+ if (success && build < 100) {
+ if (pkgBuildVersion.size() == 1)
+ pkgBuildVersion.prepend(QLatin1Char('0'));
+ applicationVersion.append(pkgBuildVersion);
+ } else {
+ fprintf(stderr, "Warning: Invalid DEPLOYMENT.pkg_build_version (%s), must be a number between 0 - 99\n", qPrintable(pkgBuildVersion));
+ }
+ }
+
// Package header
QString sisHeader = "; SIS header: name, uid, version\n#{\"%1\"},(%2),%3\n\n";
QString visualTarget = generator->escapeFilePath(project->first("TARGET"));