diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-08-11 18:50:11 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-09-02 16:30:54 +0000 |
| commit | c7ce952d6fcc033bd344acaa4caa95ee958687c9 (patch) | |
| tree | c1e7188666caca9e172a97d7bea45c4418346d0d | |
| parent | 37d673313d65852c8c37b8066158046df9b5f49a (diff) | |
CMake: Add reference documentation for QT_IOS_LAUNCH_SCREEN
Amends 578f4ba00c9fce9af922c9924ca104bc47e50f03
Task-number: QTBUG-104519
Change-Id: I02ea0694ead0e5b8c7a70a09cc14b51d8e374dd5
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 3eb2918f2ec95d1efd198106e78a109b1accfd86)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | doc/global/macros.qdocconf | 3 | ||||
| -rw-r--r-- | src/corelib/doc/src/cmake/cmake-configure-variables.qdoc | 29 | ||||
| -rw-r--r-- | src/corelib/doc/src/cmake/cmake-properties.qdoc | 19 |
3 files changed, 46 insertions, 5 deletions
diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index 31cecc1b78..e79ed161ff 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -85,3 +85,6 @@ macro.cmakevariableandroidonly = "\\note This variable is used only if targeting macro.versionlessCMakeCommandsNote = "If \\l{Versionless commands}{versionless commands} are disabled, use \\c{\1} instead. It supports the same set of arguments as this command." macro.cmakepropertywebassemblyonly = "\\note This property is used only if targeting the WebAssembly platform." + +macro.cmakepropertyiosonly = "\\note This property is used only if targeting iOS." +macro.cmakevariableiosonly = "\\note This variable is used only if targeting iOS." diff --git a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc index ffcddffc37..4b759c649b 100644 --- a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc +++ b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc @@ -98,11 +98,11 @@ supplied by the Qt installer, with the corresponding naming of the directories. The typical directory structure looks as below: \badcode /path/to/Qt/6.x.x - android_armv7 - android_arm64_v8a - android_x86 - android_x86_64 - ... + android_armv7 + android_arm64_v8a + android_x86 + android_x86_64 + ... \endcode The auto-detected paths can be customized using one of \c{QT_PATH_ANDROID_ABI_<ABI>} variables. @@ -349,3 +349,22 @@ methods provided by CMake. \sa {qt6_standard_project_setup}{qt_standard_project_setup()} */ + +/*! +\page cmake-variable-QT_IOS_LAUNCH_SCREEN.html +\ingroup cmake-variables-qtcore + +\title QT_IOS_LAUNCH_SCREEN +\target cmake-variable-QT_IOS_LAUNCH_SCREEN + +\summary {Path to iOS launch screen storyboard used by all targets} + +\cmakevariablesince 6.4 +\preliminarycmakevariable +\cmakevariableiosonly + +Specifies the path to an iOS launch screen storyboard file that will be used +by all targets within a project. + +\sa {Launch Screens and Launch Images} +*/ diff --git a/src/corelib/doc/src/cmake/cmake-properties.qdoc b/src/corelib/doc/src/cmake/cmake-properties.qdoc index bbb948aec2..57205a9193 100644 --- a/src/corelib/doc/src/cmake/cmake-properties.qdoc +++ b/src/corelib/doc/src/cmake/cmake-properties.qdoc @@ -445,3 +445,22 @@ QT_WASM_INITIAL_MEMORY must be a multiple of 65536 bytes. For more information, see \l{https://github.com/emscripten-core/emscripten/blob/main/src/settings.js}{Emscripten compiler settings}. */ + +/*! +\page cmake-target-property-QT_IOS_LAUNCH_SCREEN.html +\ingroup cmake-properties-qtcore +\ingroup cmake-target-properties-qtcore + +\title QT_IOS_LAUNCH_SCREEN +\target cmake-target-property-QT_IOS_LAUNCH_SCREEN + +\summary {Path to iOS launch screen storyboard} + +\cmakepropertysince 6.4 +\preliminarycmakeproperty +\cmakepropertyiosonly + +Specifies the path to an iOS launch screen storyboard file. + +\sa {Launch Screens and Launch Images} +*/ |