From 8fdaa081fdf1749fabf23dcb4b9b07e800b785a0 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 26 Apr 2021 12:14:46 +0200 Subject: 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 --- src/corelib/doc/src/cmake-macros.qdoc | 2 ++ src/corelib/doc/src/cmake-properties.qdoc | 42 +++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) (limited to 'src/corelib/doc/src') diff --git a/src/corelib/doc/src/cmake-macros.qdoc b/src/corelib/doc/src/cmake-macros.qdoc index d14fc5badb..53aebfba17 100644 --- a/src/corelib/doc/src/cmake-macros.qdoc +++ b/src/corelib/doc/src/cmake-macros.qdoc @@ -529,6 +529,8 @@ how to accomplish this. \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_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} \li \l{cmake-target-property-QT_QML_IMPORT_PATH}{QT_QML_IMPORT_PATH} \li \l{cmake-target-property-QT_QML_ROOT_PATH}{QT_QML_ROOT_PATH} \li \l{cmake-target-property-qt_no_entrypoint}{qt_no_entrypoint} diff --git a/src/corelib/doc/src/cmake-properties.qdoc b/src/corelib/doc/src/cmake-properties.qdoc index 87809dcd08..5887875cab 100644 --- a/src/corelib/doc/src/cmake-properties.qdoc +++ b/src/corelib/doc/src/cmake-properties.qdoc @@ -143,6 +143,48 @@ 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_VERSION_CODE.html +\ingroup cmake-properties-qtcore +\ingroup cmake-target-properties-qtcore + +\title QT_ANDROID_VERSION_CODE +\target cmake-target-property-QT_ANDROID_VERSION_CODE + +\brief Internal Android app version. + +\preliminarycmakeproperty +\cmakepropertyandroidonly + +Specifies the app's version number. This is usually a number that +increments monotonically with each release of your project. + +For more information, see \l{Android: App Versioning}{Android App Versioning}. + +\sa{qt6_android_generate_deployment_settings}{qt_android_generate_deployment_settings()} +*/ + +/*! +\page cmake-target-property-QT_ANDROID_VERSION_NAME.html +\ingroup cmake-properties-qtcore +\ingroup cmake-target-properties-qtcore + +\title QT_ANDROID_VERSION_NAME +\target cmake-target-property-QT_ANDROID_VERSION_NAME + +\brief Human-readable Android app version. + +\preliminarycmakeproperty +\cmakepropertyandroidonly + +Specifies the app's version as a human readable string, usually three +numbers, separated by dots. + +For more information, see \l{Android: App Versioning}{Android App Versioning}. + +\sa{qt6_android_generate_deployment_settings}{qt_android_generate_deployment_settings()} +*/ + /*! \page cmake-target-property-QT_QML_ROOT_PATH.html \ingroup cmake-properties-qtcore -- cgit v1.2.3