diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-05 13:35:56 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-05 13:35:56 +0200 |
| commit | 4bc574125b76f480c8eb5719459baa9bd0b8e1c3 (patch) | |
| tree | 5248d80420cbea7aa39f5355cf5b320486b99a1c /share | |
| parent | 9362b2a4be9f3a92020a169f1bb2896667974dda (diff) | |
| parent | 3a51a17d72f49647449eab949ae30d7c09ced3ef (diff) | |
Merge 1.6 into master
Change-Id: Ica9e01e8dc03fe0d36568a270bbad9b85919c952
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/imports/qbs/Probes/GccProbe.qbs | 4 | ||||
| -rw-r--r-- | share/qbs/modules/java/JavaModule.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/nodejs/NodeJS.qbs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/share/qbs/imports/qbs/Probes/GccProbe.qbs b/share/qbs/imports/qbs/Probes/GccProbe.qbs index 4724d42b5..734f11323 100644 --- a/share/qbs/imports/qbs/Probes/GccProbe.qbs +++ b/share/qbs/imports/qbs/Probes/GccProbe.qbs @@ -41,9 +41,9 @@ PathProbe { property bool _haveArchFlag: qbs.targetOS.contains("darwin") property string _nullDevice: qbs.nullDevice - property string _toolchain: qbs.toolchain + property stringList _toolchain: qbs.toolchain property string _pathListSeparator: qbs.pathListSeparator - property string _targetOS: qbs.targetOS + property stringList _targetOS: qbs.targetOS property string _sysroot: qbs.sysroot // Outputs 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 |