diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-06-01 13:00:47 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-06-02 18:35:20 +0000 |
| commit | a63002868790852b554e5e2ae20af67a3e7aaea6 (patch) | |
| tree | 7aad8a86da51bb252abd60b0596023a99bb45be8 | |
| parent | b514e53748da17cd0d07df788a297f545e2c4f86 (diff) | |
Fix QNX SDK probe on Windows
The OS check should have been using the host, not target OS, and
the HOME location is only used on Unix.
Task-number: QBS-1136
Change-Id: I880cdae5c85a875e8b392a4efe1e5d7688c15732
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | share/qbs/modules/qnx/qnx.qbs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/share/qbs/modules/qnx/qnx.qbs b/share/qbs/modules/qnx/qnx.qbs index 830213dcd..1dc677850 100644 --- a/share/qbs/modules/qnx/qnx.qbs +++ b/share/qbs/modules/qnx/qnx.qbs @@ -40,8 +40,9 @@ Module { Probes.PathProbe { id: qnxSdkProbe names: ["qnx700", "qnx660", "qnx650"] - pathPrefixes: [Environment.getEnv("HOME"), - qbs.targetOS.contains("windows") ? "C:/" : "/opt"] + pathPrefixes: qbs.hostOS.contains("windows") + ? [Environment.getEnv("USERPROFILE"), "C:/"] + : [Environment.getEnv("HOME"), "/opt"] } Probe { |