diff options
| -rw-r--r-- | share/qbs/modules/Android/ndk/ndk.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/Android/sdk/sdk.qbs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/share/qbs/modules/Android/ndk/ndk.qbs b/share/qbs/modules/Android/ndk/ndk.qbs index 4bc4736a1..7ab8d58f7 100644 --- a/share/qbs/modules/Android/ndk/ndk.qbs +++ b/share/qbs/modules/Android/ndk/ndk.qbs @@ -39,7 +39,7 @@ import "utils.js" as NdkUtils Module { Probes.AndroidNdkProbe { id: ndkProbe - environmentPaths: [ndkDir].concat(base) + environmentPaths: (ndkDir ? [ndkDir] : []).concat(base) } readonly property string abi: NdkUtils.androidAbi(qbs.architecture) diff --git a/share/qbs/modules/Android/sdk/sdk.qbs b/share/qbs/modules/Android/sdk/sdk.qbs index f665835f9..d7c373706 100644 --- a/share/qbs/modules/Android/sdk/sdk.qbs +++ b/share/qbs/modules/Android/sdk/sdk.qbs @@ -40,13 +40,13 @@ import "utils.js" as SdkUtils Module { Probes.AndroidSdkProbe { id: sdkProbe - environmentPaths: [sdkDir].concat(base) + environmentPaths: (sdkDir ? [sdkDir] : []).concat(base) } Probes.AndroidNdkProbe { id: ndkProbe sdkPath: sdkProbe.path - environmentPaths: [ndkDir].concat(base) + environmentPaths: (ndkDir ? [ndkDir] : []).concat(base) } property path sdkDir: sdkProbe.path |