diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2018-01-22 21:47:38 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2018-01-25 16:14:00 +0000 |
| commit | 5423eed454e89b250ba69a5fb2f53ea29aed421f (patch) | |
| tree | fd40891773e30af68338f5e6eeb7950489a75cb3 /share/qbs/imports/qbs/Probes | |
| parent | 7553fd75cf2b8d16134478157cffd3886b21e36d (diff) | |
Add better module validation for Android SDK and NDK
Users now get more friendly error messages when the SDK and/or NDK are
not installed.
Change-Id: Icfc438ed16b88aea190bf766ddc58b26b0512121
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/imports/qbs/Probes')
| -rw-r--r-- | share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs | 1 | ||||
| -rw-r--r-- | share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs index 505675354..e6c4256bf 100644 --- a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs +++ b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs @@ -79,6 +79,7 @@ PathProbe { } var i, j, allPaths = (environmentPaths || []).concat(platformPaths || []); + candidatePaths = allPaths; for (i in allPaths) { var platforms = []; if (hostOS.contains("windows")) diff --git a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs index acd5c0003..b3f96ca3b 100644 --- a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs +++ b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs @@ -53,6 +53,7 @@ PathProbe { configure: { var i, allPaths = (environmentPaths || []).concat(platformPaths || []); + candidatePaths = allPaths; for (i in allPaths) { if (File.exists(FileInfo.joinPaths(allPaths[i], "tools", "android"))) { path = allPaths[i]; |