diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-12-22 23:52:56 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-12-23 19:33:38 +0000 |
| commit | 997dfdb0bf10d0359ac210385f9b8ab87ff94c17 (patch) | |
| tree | 80fc3d8b26621a94ad5079ec760a21e2f29ad77a | |
| parent | ccf88833f29617a628df1232b246ce335e21d880 (diff) | |
Prevent undefined values from getting into lists
Change-Id: I8979a11ce27ffb363fa6bd696b132a9710300fa5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -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 |