1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: set default API level to 23 in docs

Browse Source 
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>
This commit is contained in:
Assam Boudjelthia 2020-09-23 10:25:19 +03:00
parent 1c33b4e729
commit ac0be4d568
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtAutoDetect.cmake
View File

@ -19,8 +19,8 @@ function(qt_auto_detect_android)
if(android_detected) if(android_detected)
message(STATUS "Android toolchain file detected, checking configuration defaults...") message(STATUS "Android toolchain file detected, checking configuration defaults...")
if(NOT DEFINED ANDROID_NATIVE_API_LEVEL) if(NOT DEFINED ANDROID_NATIVE_API_LEVEL)
message(STATUS "ANDROID_NATIVE_API_LEVEL was not specified, using API level 21 as default") message(STATUS "ANDROID_NATIVE_API_LEVEL was not specified, using API level 23 as default")
set(ANDROID_NATIVE_API_LEVEL 21 CACHE STRING "") set(ANDROID_NATIVE_API_LEVEL 23 CACHE STRING "")
endif() endif()
if(NOT DEFINED ANDROID_STL) if(NOT DEFINED ANDROID_STL)
set(ANDROID_STL "c++_shared" CACHE STRING "") set(ANDROID_STL "c++_shared" CACHE STRING "")

2
cmake/README.md
View File

@ -168,7 +168,7 @@ If you don't supply the configuration argument ``-DANDROID_ABI=...``, it will de
* x86: ``-DANDROID_ABI=x86`` * x86: ``-DANDROID_ABI=x86``
* x86_64: ``-DANDROID_ABI=x86_64`` * 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}`` configuration argument to the above CMake call: ``-DANDROID_NATIVE_API_LEVEL=${API_LEVEL}``
### Cross compiling for iOS ### Cross compiling for iOS

2
qmake/doc/src/qmake-manual.qdoc
View File

@ -1074,7 +1074,7 @@
\note This variable applies only to Android targets. \note This variable applies only to Android targets.
Specifies the minimum Android API level for the project. By default, this 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 \target ANDROID_PACKAGE_SOURCE_DIR
\section1 ANDROID_PACKAGE_SOURCE_DIR \section1 ANDROID_PACKAGE_SOURCE_DIR