diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-12-07 16:36:12 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-12-15 20:23:28 +0100 |
| commit | b43a39977b9eeea344eea5ee4e71a6586d512fb6 (patch) | |
| tree | 53d3c939f713d0929bcb4fb40720dd20428aa64c /src/corelib/doc | |
| parent | 5e00c0c5e55c5a87b19655947d97ca6192e02e1e (diff) | |
CMake: Deprecate some android public APIs
Deprecate usage of:
- qt_android_add_apk_target
- qt_android_apply_arch_suffix
- qt_android_generate_deployment_settings
when used by user projects directly. Instead, projects should use
qt_add_executable / qt_add_library.
Show a deprecation warning when the commands are used directly.
The deprecation warnings can be silenced using cmake's
-Wno-deprecated command line option.
To detect non-direct usage from inside our own function
implementations, we set some target properties which are then read to
decide whether to show the message.
Pick-to: 6.5
Fixes: QTBUG-108508
Change-Id: Ib039cc5f3a01c2276173abb1e43f4eed216d0170
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/corelib/doc')
3 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/doc/src/cmake/qt_android_add_apk_target.qdoc b/src/corelib/doc/src/cmake/qt_android_add_apk_target.qdoc index 747849eabb..4ab9b3d53d 100644 --- a/src/corelib/doc/src/cmake/qt_android_add_apk_target.qdoc +++ b/src/corelib/doc/src/cmake/qt_android_add_apk_target.qdoc @@ -13,7 +13,7 @@ \include cmake-find-package-core.qdocinc \cmakecommandsince 6.0 -\preliminarycmakecommand +\warning This command is deprecated since Qt 6.5. Use \l qt_add_executable instead. \cmakecommandandroidonly \section1 Synopsis diff --git a/src/corelib/doc/src/cmake/qt_android_apply_arch_suffix.qdoc b/src/corelib/doc/src/cmake/qt_android_apply_arch_suffix.qdoc index 4d4585693d..363bba1097 100644 --- a/src/corelib/doc/src/cmake/qt_android_apply_arch_suffix.qdoc +++ b/src/corelib/doc/src/cmake/qt_android_apply_arch_suffix.qdoc @@ -13,7 +13,8 @@ \include cmake-find-package-core.qdocinc \cmakecommandsince 6.0 -\preliminarycmakecommand +\warning This command is deprecated since Qt 6.5. Use \l qt_add_executable +or \l qt_add_library instead. \cmakecommandandroidonly \section1 Synopsis diff --git a/src/corelib/doc/src/cmake/qt_android_generate_deployment_settings.qdoc b/src/corelib/doc/src/cmake/qt_android_generate_deployment_settings.qdoc index a717c80e7c..d71fa092f8 100644 --- a/src/corelib/doc/src/cmake/qt_android_generate_deployment_settings.qdoc +++ b/src/corelib/doc/src/cmake/qt_android_generate_deployment_settings.qdoc @@ -13,7 +13,7 @@ \include cmake-find-package-core.qdocinc \cmakecommandsince 6.0 -\preliminarycmakecommand +\warning This command is deprecated since Qt 6.5. Use \l qt_add_executable instead. \cmakecommandandroidonly \section1 Synopsis |