diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-04-26 12:14:46 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-04-26 23:11:28 +0200 |
| commit | 8fdaa081fdf1749fabf23dcb4b9b07e800b785a0 (patch) | |
| tree | 12d9beaf64c92c0fd0c123ad98ce30f9c0f9883c /src/corelib/Qt6AndroidMacros.cmake | |
| parent | adf29329ead34e4fa805ef19370b2e5172bd61e0 (diff) | |
Add QT_ANDROID_VERSION_{NAME|CODE} target properties
Those are the CMake counterparts of the qmake variables
ANDROID_VERSION_{NAME|CODE}.
Pick-to: 6.1
Task-number: QTBUG-86033
Change-Id: I57534ff04db0c78871fe7ba81bedaf377422054b
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/corelib/Qt6AndroidMacros.cmake')
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index c520242d06..182d004575 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -147,9 +147,19 @@ function(qt6_android_generate_deployment_settings target) " \"android-package-source-directory\": \"${android_package_source_dir_native}\",\n") endif() - #TODO: ANDROID_VERSION_NAME, doesn't seem to be used? + # version code + get_target_property(android_version_code ${target} QT_ANDROID_VERSION_CODE) + if (android_version_code) + string(APPEND file_contents + " \"android-version-code\": \"${android_version_code}\",\n") + endif() - #TODO: ANDROID_VERSION_CODE, doesn't seem to be used? + # version name + get_target_property(android_version_name ${target} QT_ANDROID_VERSION_NAME) + if (android_version_name) + string(APPEND file_contents + " \"android-version-name\": \"${android_version_name}\",\n") + endif() get_target_property(qml_import_path ${target} QT_QML_IMPORT_PATH) if (qml_import_path) |