From 1cf9d066751743ec0714903e29d5318b1437b551 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 30 May 2022 22:30:18 +0300 Subject: [PATCH] Android: update NDK version for latest Qt version (Qt 6.4) Since Qt 6.4 is built with NDK r23b, use that by default for user apps as well. This is also needed to account for QTBUG-102972. Task-number: QTBUG-102972 Change-Id: Id8485e0477b5e36c4d895582f5700c1f16b5a0c5 Reviewed-by: Alessandro Portale Reviewed-by: --- share/qtcreator/android/sdk_definitions.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/android/sdk_definitions.json b/share/qtcreator/android/sdk_definitions.json index 76e67c9fced..9dd6ee4caed 100644 --- a/share/qtcreator/android/sdk_definitions.json +++ b/share/qtcreator/android/sdk_definitions.json @@ -18,11 +18,16 @@ "specific_qt_versions": [ { "versions": ["default"], + "sdk_essential_packages": ["build-tools;31.0.0", "ndk;23.1.7779620"], + "ndk_path": "ndk/23.1.7779620" + }, + { + "versions": ["6.3", "6.2", "5.15"], "sdk_essential_packages": ["build-tools;31.0.0", "ndk;22.1.7171670"], "ndk_path": "ndk/22.1.7171670" }, { - "versions": ["5.15.[0-8]", "5.14.[0-2]", "5.13.2"], + "versions": ["5.15.[0-8]", "5.14.[0-2]", "5.13.2", "6.0", "6.1"], "sdk_essential_packages": ["build-tools;31.0.0", "ndk;21.3.6528147"], "ndk_path": "ndk/21.3.6528147" },