diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-09-03 18:25:48 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-09-04 10:47:28 +0000 |
| commit | 27bbf57af385edde72b914ccdbe0f1d4d7c83144 (patch) | |
| tree | 540885d0ddfe4331446afbdc5a549c6cbae56320 /share/qbs/imports | |
| parent | 64a88ae06147f4d1a13dcf39da853434e0778b76 (diff) | |
baremetal: Fix assignment of probes 'found' flag
Change-Id: I532e06f6688c5ad32702cd3401ae4ef37200a23f
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/imports')
| -rw-r--r-- | share/qbs/imports/qbs/Probes/IarProbe.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/imports/qbs/Probes/KeilProbe.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/imports/qbs/Probes/SdccProbe.qbs | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/share/qbs/imports/qbs/Probes/IarProbe.qbs b/share/qbs/imports/qbs/Probes/IarProbe.qbs index d261e9065..2555ba4bd 100644 --- a/share/qbs/imports/qbs/Probes/IarProbe.qbs +++ b/share/qbs/imports/qbs/Probes/IarProbe.qbs @@ -83,7 +83,7 @@ PathProbe { versionMajor = version.major; versionMinor = version.minor; versionPatch = version.patch; - found = version && architecture && endianness; + found = !!architecture && !!endianness; } } } diff --git a/share/qbs/imports/qbs/Probes/KeilProbe.qbs b/share/qbs/imports/qbs/Probes/KeilProbe.qbs index 17a2a62bc..20ed4117c 100644 --- a/share/qbs/imports/qbs/Probes/KeilProbe.qbs +++ b/share/qbs/imports/qbs/Probes/KeilProbe.qbs @@ -81,7 +81,7 @@ PathProbe { versionMajor = version.major; versionMinor = version.minor; versionPatch = version.patch; - found = version.found && architecture && endianness; + found = !!architecture && !!endianness; } } } diff --git a/share/qbs/imports/qbs/Probes/SdccProbe.qbs b/share/qbs/imports/qbs/Probes/SdccProbe.qbs index 3595bb158..8214fc0d1 100644 --- a/share/qbs/imports/qbs/Probes/SdccProbe.qbs +++ b/share/qbs/imports/qbs/Probes/SdccProbe.qbs @@ -65,9 +65,11 @@ PathProbe { includePaths = defaultPaths.includePaths; var version = SDCC.guessVersion(macros); - versionMajor = version.major; - versionMinor = version.minor; - versionPatch = version.patch; - found = version.found; + if (version) { + versionMajor = version.major; + versionMinor = version.minor; + versionPatch = version.patch; + found = true; + } } } |