diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2021-02-27 16:34:49 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2021-02-27 14:22:30 +0000 |
commit | 88a9b167a6269244811019e9bd6e3dbd0101a786 (patch) | |
tree | c7c389bfecf10ec656e9ac6e9d1b4db981cb91ce | |
parent | bd190a8a347485e56d95fa6120f9240a9a35c780 (diff) |
baremetal: Fix detection of IAR toolchains if version contains build number
We need to allow the build number in the Version::fromString(),
otherwise it returns `unknown` version if a version ends with
the build number (i.e. when the version string contains the
four parts <major>.<minor>.<path>.<build>).
Change-Id: Ic295d53d7a68a043ce1461cbe3c84c9502407dc2
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r-- | src/app/qbs-setup-toolchains/iarewprobe.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/app/qbs-setup-toolchains/iarewprobe.cpp b/src/app/qbs-setup-toolchains/iarewprobe.cpp index 63d32bfc3..6c1506778 100644 --- a/src/app/qbs-setup-toolchains/iarewprobe.cpp +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -278,7 +278,7 @@ static std::vector<ToolchainInstallInfo> installedIarsFromRegistry() const QFileInfo iarPath(rootPath + entry.subExePath); if (iarPath.exists()) { // Note: threeLevelKey is a guessed toolchain version. - infos.push_back({iarPath, Version::fromString(threeLevelKey)}); + infos.push_back({iarPath, Version::fromString(threeLevelKey, true)}); } } registry.endGroup(); |