1 files changed, 5 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs
index d7c80144e..f7abce388 100644
--- a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs
@@ -33,6 +33,7 @@ import qbs.Environment
 import qbs.File
 import qbs.FileInfo
 import qbs.TextFile
+import "../../../modules/Android/android-utils.js" as AndroidUtils
 
 PathProbe {
     // Inputs
@@ -62,6 +63,7 @@ PathProbe {
     property var hostArch
     property stringList toolchains: []
     property string ndkVersion
+    property string ndkPlatform
 
     configure: {
         function readFileContent(filePath) {
@@ -91,6 +93,9 @@ PathProbe {
             for (j in platforms) {
                 if (File.exists(FileInfo.joinPaths(allPaths[i], "prebuilt", platforms[j]))) {
                     path = allPaths[i];
+                    var ndkPlatforms = AndroidUtils.availablePlatforms(path);
+                    if (ndkPlatforms.length > 0)
+                        ndkPlatform = ndkPlatforms[ndkPlatforms.length - 1];
                     if (File.exists(FileInfo.joinPaths(path, "samples")))
                         samplesDir = FileInfo.joinPaths(path, "samples"); // removed in r11
                     hostArch = platforms[j];