diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-03-29 01:05:59 -0700 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-03-29 14:13:08 +0000 |
| commit | 03fa92611c6e3472ca9acd722e029fe5c5a18d79 (patch) | |
| tree | a52dfd2672b905db0adcb6d4e4fe71358a33ba75 | |
| parent | 976c111036317056410c5e011428eb1a211a3342 (diff) | |
Make some adjustments necessary for QNX < 7 support
Change-Id: I978772eff14a1120921b34b861ff853e8d50c971
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | share/qbs/modules/cpp/qnx-qcc.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/qnx/qnx.qbs | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/share/qbs/modules/cpp/qnx-qcc.qbs b/share/qbs/modules/cpp/qnx-qcc.qbs index ed9d1571f..fcb4ceea0 100644 --- a/share/qbs/modules/cpp/qnx-qcc.qbs +++ b/share/qbs/modules/cpp/qnx-qcc.qbs @@ -44,7 +44,7 @@ UnixGCC { sysroot: qnx.targetDir cCompilerName: "qcc" + compilerExtension - cxxCompilerName: "q++" + compilerExtension + cxxCompilerName: (qnx.qnx7 ? "q++" : "QCC") + compilerExtension targetDriverFlags: qnxTarget ? ["-V" + qnxTarget] : [] diff --git a/share/qbs/modules/qnx/qnx.qbs b/share/qbs/modules/qnx/qnx.qbs index c84119e96..84edbe1ab 100644 --- a/share/qbs/modules/qnx/qnx.qbs +++ b/share/qbs/modules/qnx/qnx.qbs @@ -68,9 +68,11 @@ Module { version: qnxSdkProbe.found ? qnxSdkProbe.fileName.substr(3, 3).split("").join(".") : undefined + readonly property bool qnx7: Utilities.versionCompare(version, "7") >= 0 + property string sdkDir: qnxSdkProbe.filePath - property string hostArch: "x86_64" + property string hostArch: qnx7 ? "x86_64" : "x86" property string hostOs: { if (qbs.hostOS.contains("linux")) @@ -78,7 +80,7 @@ Module { if (qbs.hostOS.contains("macos")) return "darwin"; if (qbs.hostOS.contains("windows")) - return "win64"; + return qnx7 ? "win64" : "win32"; } property string targetOs: qnxTargetOsProbe.targets[0] |