aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kde.org>2019-04-22 16:54:48 +0300
committerBogDan Vatra <bogdan@kdab.com>2019-04-24 17:54:02 +0000
commit7b6550e3b7cc7c01eeeda14aa1ca3bb619c4f3a4 (patch)
tree814dcde2a8716a0a0f8586a61497363899705b05 /share/qbs/modules
parent1e61f0b35d5822ecf2b4bf960c7658d275a6b1f9 (diff)
[Android] Allow the user to override version attributes
Allow the user to override the android::versionCode and android::versionName from QBS project file. Change-Id: I437294e8f6b52c1072bb1c992d1c7ac5233896c9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules')
-rw-r--r--share/qbs/modules/Android/sdk/sdk.qbs7
1 files changed, 6 insertions, 1 deletions
diff --git a/share/qbs/modules/Android/sdk/sdk.qbs b/share/qbs/modules/Android/sdk/sdk.qbs
index 14ad92fdf..d2891e5e2 100644
--- a/share/qbs/modules/Android/sdk/sdk.qbs
+++ b/share/qbs/modules/Android/sdk/sdk.qbs
@@ -62,6 +62,8 @@ Module {
// Product-specific properties and files
property string packageName: product.name
+ property int versionCode
+ property string versionName
property string apkBaseName: packageName
property bool automaticSources: true
property bool legacyLayout: false
@@ -266,7 +268,10 @@ Module {
+ "'com.mycompany.myproduct' pattern."
}
rootElem.setAttribute("package", packageName);
-
+ if (product.Android.sdk.versionCode !== undefined)
+ rootElem.setAttribute("android:versionCode", product.Android.sdk.versionCode);
+ if (product.Android.sdk.versionName !== undefined)
+ rootElem.setAttribute("android:versionName", product.Android.sdk.versionName);
manifestData.save(output.filePath, 4);
}
return cmd;