Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	qmake/generators/win32/msbuild_objectmodel.cpp
	qmake/generators/win32/msvc_vcxproj.cpp
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp

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"));