From 5b9e896eaa1d8fcaff1bb2b3c146db96263c2922 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 26 Apr 2021 12:31:17 +0200 Subject: [PATCH] Add QT_ANDROID_MIN_SDK_VERSION target property This is the counterpart to the qmake variable ANDROID_MIN_SDK_VERSION. Task-number: QTBUG-86033 Change-Id: I4e1434a794f3a8345f9b4e045ab4366d486221af Reviewed-by: Alexandru Croitor Reviewed-by: Assam Boudjelthia (cherry picked from commit d1eeef26256eaf6b8fbcf4a2fbe1b1dfb44f4704) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6AndroidMacros.cmake | 7 +++++++ src/corelib/doc/src/cmake-macros.qdoc | 1 + src/corelib/doc/src/cmake-properties.qdoc | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 182d0045754..ada8495a98a 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -161,6 +161,13 @@ function(qt6_android_generate_deployment_settings target) " \"android-version-name\": \"${android_version_name}\",\n") endif() + # minimum SDK version + get_target_property(android_min_sdk_version ${target} QT_ANDROID_MIN_SDK_VERSION) + if(android_min_sdk_version) + string(APPEND file_contents + " \"android-min-sdk-version\": \"${android_min_sdk_version}\",\n") + endif() + get_target_property(qml_import_path ${target} QT_QML_IMPORT_PATH) if (qml_import_path) set(_import_paths "") diff --git a/src/corelib/doc/src/cmake-macros.qdoc b/src/corelib/doc/src/cmake-macros.qdoc index 53aebfba172..ffbf673a327 100644 --- a/src/corelib/doc/src/cmake-macros.qdoc +++ b/src/corelib/doc/src/cmake-macros.qdoc @@ -528,6 +528,7 @@ how to accomplish this. \li \l{cmake-target-property-QT_ANDROID_DEPLOYMENT_DEPENDENCIES}{QT_ANDROID_DEPLOYMENT_DEPENDENCIES} \li \l{cmake-target-property-QT_ANDROID_EXTRA_LIBS}{QT_ANDROID_EXTRA_LIBS} \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_VERSION_NAME}{QT_ANDROID_VERSION_NAME} \li \l{cmake-target-property-QT_ANDROID_VERSION_CODE}{QT_ANDROID_VERSION_CODE} diff --git a/src/corelib/doc/src/cmake-properties.qdoc b/src/corelib/doc/src/cmake-properties.qdoc index 5887875cab6..8d2dce5b158 100644 --- a/src/corelib/doc/src/cmake-properties.qdoc +++ b/src/corelib/doc/src/cmake-properties.qdoc @@ -111,6 +111,24 @@ that. \sa{qt6_android_generate_deployment_settings}{qt_android_generate_deployment_settings()} */ +/*! +\page cmake-target-property-QT_ANDROID_MIN_SDK_VERSION.html +\ingroup cmake-properties-qtcore +\ingroup cmake-target-properties-qtcore + +\title QT_ANDROID_MIN_SDK_VERSION +\target cmake-target-property-QT_ANDROID_MIN_SDK_VERSION + +\brief Minimum Android SDK version. + +\preliminarycmakeproperty +\cmakepropertyandroidonly + +Specifies the minimum Android API level for the target. + +\sa{qt6_android_generate_deployment_settings}{qt_android_generate_deployment_settings()} +*/ + /*! \page cmake-target-property-QT_ANDROID_PACKAGE_SOURCE_DIR.html \ingroup cmake-properties-qtcore