diff --git a/cmake/QtAutoDetectHelpers.cmake b/cmake/QtAutoDetectHelpers.cmake index ad0764b804b..56218883084 100644 --- a/cmake/QtAutoDetectHelpers.cmake +++ b/cmake/QtAutoDetectHelpers.cmake @@ -137,9 +137,9 @@ function(qt_auto_detect_android) # ANDROID_NATIVE_API_LEVEL is an just an alias to ANDROID_PLATFORM, check for both if(NOT DEFINED ANDROID_PLATFORM AND NOT DEFINED ANDROID_NATIVE_API_LEVEL) message(STATUS "Neither ANDROID_PLATFORM nor ANDROID_NATIVE_API_LEVEL" - " were specified, using API level 23 as default") - set(ANDROID_PLATFORM "android-23" CACHE STRING "") - set(ANDROID_NATIVE_API_LEVEL 23 CACHE STRING "") + " were specified, using API level 28 as default") + set(ANDROID_PLATFORM "android-28" CACHE STRING "") + set(ANDROID_NATIVE_API_LEVEL 28 CACHE STRING "") endif() if(NOT DEFINED ANDROID_STL) set(ANDROID_STL "c++_shared" CACHE STRING "") diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index f410dc9b2a7..f29b55b3491 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -841,7 +841,7 @@ function(qt_generate_global_device_pri_file) file(TO_CMAKE_PATH ${ANDROID_NDK} ANDROID_NDK) string(APPEND content "DEFAULT_ANDROID_NDK_ROOT = ${ANDROID_NDK}\n") - set(android_platform "android-23") + set(android_platform "android-28") if(ANDROID_PLATFORM) set(android_platform "${ANDROID_PLATFORM}") elseif(ANDROID_NATIVE_API_LEVEL) diff --git a/cmake/README.md b/cmake/README.md index 9d0743566d2..0d8179a32c8 100644 --- a/cmake/README.md +++ b/cmake/README.md @@ -190,7 +190,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 23. Should you need to change this supply the following +By default we set the android API level to 28. Should you need to change this supply the following configuration argument to the above CMake call: ``-DANDROID_PLATFORM=android-${API_LEVEL}``. ### Cross compiling for iOS diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index bc520659031..6a184f61192 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -89,7 +89,7 @@ The following table describes the mapping of configure options to CMake argument | | | assumed. | | -android-sdk | -DANDROID_SDK_ROOT= | | | -android-ndk | -DCMAKE_TOOLCHAIN_FILE= | | -| -android-ndk-platform android-23 | -DANDROID_PLATFORM=android-23 | | +| -android-ndk-platform android-28 | -DANDROID_PLATFORM=android-28 | | | -android-abis ,..., | -DANDROID_ABI= | only one ABI can be specified | | -android-style-assets | -DFEATURE_android_style_assets=ON | | | -android-javac-source | -DQT_ANDROID_JAVAC_SOURCE=7 | Set the javac build source version. | diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index d5a5a3264fb..b3260b09852 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -90,9 +90,9 @@ macro.NdkVer = "r26b" macro.NdkFullVer = "26.1.10909125" macro.NdkCompilerVer = "Clang 17.0.2" macro.JdkVer = "17" -macro.AndroidMinApiVer = "26" +macro.AndroidMinApiVer = "28" macro.AndroidMaxApiVer = "34" -macro.AndroidMinVer = "8.0" +macro.AndroidMinVer = "9" macro.AndroidMaxVer = "14" macro.AndroidPlatformVer = "34" macro.AndroidBuildToolsVer = "34.0.0" diff --git a/src/android/jar/build.gradle b/src/android/jar/build.gradle index 452d4ad780f..99ad69aeac5 100644 --- a/src/android/jar/build.gradle +++ b/src/android/jar/build.gradle @@ -27,7 +27,7 @@ android { namespace "org.qtproject.qt.android" defaultConfig { - minSdkVersion 23 + minSdkVersion 28 } sourceSets { diff --git a/src/network/android/jar/build.gradle b/src/network/android/jar/build.gradle index 68a9381ad23..86a42bd9c1c 100644 --- a/src/network/android/jar/build.gradle +++ b/src/network/android/jar/build.gradle @@ -26,7 +26,7 @@ android { compileSdk 34 defaultConfig { - minSdkVersion 23 + minSdkVersion 28 } sourceSets { diff --git a/src/plugins/networkinformation/android/jar/build.gradle b/src/plugins/networkinformation/android/jar/build.gradle index 68a9381ad23..86a42bd9c1c 100644 --- a/src/plugins/networkinformation/android/jar/build.gradle +++ b/src/plugins/networkinformation/android/jar/build.gradle @@ -26,7 +26,7 @@ android { compileSdk 34 defaultConfig { - minSdkVersion 23 + minSdkVersion 28 } sourceSets { diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index da5c2c8c775..b5751e9a409 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -165,7 +165,7 @@ struct Options // Versioning QString versionName; QString versionCode; - QByteArray minSdkVersion{"23"}; + QByteArray minSdkVersion{"28"}; QByteArray targetSdkVersion{"34"}; // lib c++ path @@ -1849,8 +1849,8 @@ bool updateAndroidManifest(Options &options) if (reader.isStartElement()) { if (reader.name() == "uses-sdk"_L1) { if (reader.attributes().hasAttribute("android:minSdkVersion"_L1)) - if (reader.attributes().value("android:minSdkVersion"_L1).toInt() < 23) { - fprintf(stderr, "Invalid minSdkVersion version, minSdkVersion must be >= 23\n"); + if (reader.attributes().value("android:minSdkVersion"_L1).toInt() < 28) { + fprintf(stderr, "Invalid minSdkVersion version, minSdkVersion must be >= 28\n"); return false; } } else if ((reader.name() == "application"_L1 ||