diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-23 10:25:19 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-23 17:59:07 +0300 |
| commit | ac0be4d568f2961556a6a07fffc3425ea4adb7db (patch) | |
| tree | 7f345cdddacbb857173b3752d00f9544a2fd9fc2 | |
| parent | 1c33b4e7298c016e9a3b45be065cd02fbd337364 (diff) | |
Android: set default API level to 23 in docs
Android minimum API level for Qt 6 is 23, this reflects that to some
instances that still mention 21.
Change-Id: I996f3ed3af14dca114129351d6ea06afcb8f45f5
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtAutoDetect.cmake | 4 | ||||
| -rw-r--r-- | cmake/README.md | 2 | ||||
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake index 683978a65a..5a575d2de3 100644 --- a/cmake/QtAutoDetect.cmake +++ b/cmake/QtAutoDetect.cmake @@ -19,8 +19,8 @@ function(qt_auto_detect_android) if(android_detected) message(STATUS "Android toolchain file detected, checking configuration defaults...") if(NOT DEFINED ANDROID_NATIVE_API_LEVEL) - message(STATUS "ANDROID_NATIVE_API_LEVEL was not specified, using API level 21 as default") - set(ANDROID_NATIVE_API_LEVEL 21 CACHE STRING "") + message(STATUS "ANDROID_NATIVE_API_LEVEL was not specified, using API level 23 as default") + set(ANDROID_NATIVE_API_LEVEL 23 CACHE STRING "") endif() if(NOT DEFINED ANDROID_STL) set(ANDROID_STL "c++_shared" CACHE STRING "") diff --git a/cmake/README.md b/cmake/README.md index a4ec5a5852..872e93b2f8 100644 --- a/cmake/README.md +++ b/cmake/README.md @@ -168,7 +168,7 @@ If you don't supply the configuration argument ``-DANDROID_ABI=...``, it will de * x86: ``-DANDROID_ABI=x86`` * x86_64: ``-DANDROID_ABI=x86_64`` -By default we set the android API level to 21. Should you need to change this supply the following +By default we set the android API level to 23. Should you need to change this supply the following configuration argument to the above CMake call: ``-DANDROID_NATIVE_API_LEVEL=${API_LEVEL}`` ### Cross compiling for iOS diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 9335d27b13..61a022fd15 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1074,7 +1074,7 @@ \note This variable applies only to Android targets. Specifies the minimum Android API level for the project. By default, this - variable is set to API level 21. + variable is set to API level 23. \target ANDROID_PACKAGE_SOURCE_DIR \section1 ANDROID_PACKAGE_SOURCE_DIR |