diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-08-31 12:22:05 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-08-31 11:00:58 +0000 |
| commit | 696292719b75bd33d2cad0f6dbb9d2c1c123df5c (patch) | |
| tree | 85f98f01a16565b726f0d7bd9ecb3cb85b944238 | |
| parent | 46d74f158f69edb7ab179eb38691f5b870745478 (diff) | |
Fix the input values of some Probes
The value "undefined" could get into input arrays.
Change-Id: I4f2fb6b076b0d11cd56717d16f9dc6be41bed252
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | share/qbs/modules/java/JavaModule.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/nodejs/NodeJS.qbs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/share/qbs/modules/java/JavaModule.qbs b/share/qbs/modules/java/JavaModule.qbs index ef9de5543..888939eeb 100644 --- a/share/qbs/modules/java/JavaModule.qbs +++ b/share/qbs/modules/java/JavaModule.qbs @@ -40,7 +40,7 @@ import "utils.js" as JavaUtils Module { Probes.JdkProbe { id: jdk - environmentPaths: [jdkPath].concat(base) + environmentPaths: (jdkPath ? [jdkPath] : []).concat(base) } property stringList additionalClassPaths diff --git a/share/qbs/modules/nodejs/NodeJS.qbs b/share/qbs/modules/nodejs/NodeJS.qbs index 1e9b454b1..933489cef 100644 --- a/share/qbs/modules/nodejs/NodeJS.qbs +++ b/share/qbs/modules/nodejs/NodeJS.qbs @@ -42,12 +42,12 @@ Module { Probes.NodeJsProbe { id: nodejs - pathPrefixes: [toolchainInstallPath] + pathPrefixes: toolchainInstallPath ? [toolchainInstallPath] : [] } Probes.NpmProbe { id: npm - pathPrefixes: [toolchainInstallPath] + pathPrefixes: toolchainInstallPath ? [toolchainInstallPath] : [] } property path applicationFile |