AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add QT_ANDROID_TARGET_SDK_VERSION target property

Browse Source 
This is the counterpart of the qmake variable
ANDROID_TARGET_SDK_VERSION.

Pick-to: 6.1
Task-number: QTBUG-86033
Change-Id: Idd64ee06eb94826430e6be5d9d878631db67c949
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Joerg Bornemann 2021-04-26 12:45:33 +02:00
parent d1eeef2625
commit 7d48b64f41
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/Qt6AndroidMacros.cmake
View File

@ -168,6 +168,13 @@ function(qt6_android_generate_deployment_settings target)
" \"android-min-sdk-version\": \"${android_min_sdk_version}\",\n")
endif()
# target SDK version
get_target_property(android_target_sdk_version ${target} QT_ANDROID_TARGET_SDK_VERSION)
if(android_target_sdk_version)
string(APPEND file_contents
" \"android-target-sdk-version\": \"${android_target_sdk_version}\",\n")
endif()
get_target_property(qml_import_path ${target} QT_QML_IMPORT_PATH)
if (qml_import_path)
set(_import_paths "")

1
src/corelib/doc/src/cmake-macros.qdoc
View File

@ -530,6 +530,7 @@ how to accomplish this.
\li \l{cmake-target-property-QT_ANDROID_EXTRA_PLUGINS}{QT_ANDROID_EXTRA_PLUGINS}
\li \l{cmake-target-property-QT_ANDROID_MIN_SDK_VERSION}{QT_ANDROID_MIN_SDK_VERSION}
\li \l{cmake-target-property-QT_ANDROID_PACKAGE_SOURCE_DIR}{QT_ANDROID_PACKAGE_SOURCE_DIR}
\li \l{cmake-target-property-QT_ANDROID_TARGET_SDK_VERSION}{QT_ANDROID_TARGET_SDK_VERSION}
\li \l{cmake-target-property-QT_ANDROID_VERSION_NAME}{QT_ANDROID_VERSION_NAME}
\li \l{cmake-target-property-QT_ANDROID_VERSION_CODE}{QT_ANDROID_VERSION_CODE}
\li \l{cmake-target-property-QT_QML_IMPORT_PATH}{QT_QML_IMPORT_PATH}

18
src/corelib/doc/src/cmake-properties.qdoc
View File

@ -161,6 +161,24 @@ then place this directly into the directory specified by this variable.
\sa{qt6_android_generate_deployment_settings}{qt_android_generate_deployment_settings()}
*/
/*!
\page cmake-target-property-QT_ANDROID_TARGET_SDK_VERSION.html
\ingroup cmake-properties-qtcore
\ingroup cmake-target-properties-qtcore
\title QT_ANDROID_TARGET_SDK_VERSION
\target cmake-target-property-QT_ANDROID_TARGET_SDK_VERSION
\brief Android target SDK version.
\preliminarycmakeproperty
\cmakepropertyandroidonly
Specifies the target Android API level for the target.
\sa{qt6_android_generate_deployment_settings}{qt_android_generate_deployment_settings()}
*/
/*!
\page cmake-target-property-QT_ANDROID_VERSION_CODE.html
\ingroup cmake-properties-qtcore