aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2019-07-29 19:48:12 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2019-07-30 13:38:13 +0000
commit2363f13f8fbd001a3544acb2a600010893e4cf80 (patch)
treed6d281e98d3ce6be689bf6592dd95b88a7804183 /src
parent1ce230bfda1f9c2dc69bbdfb63a7586d0e7770a4 (diff)
baremetal: Add additional filter '*-gcc-[1-9]*' string
... that allow to auto-detect the GCC toolchains with names like 'avr-gcc-5.4.0' and so forth. Change-Id: I004f68b8aeb2a17124cfd53d3643584dc6aa1bc6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/app/qbs-setup-toolchains/gccprobe.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/app/qbs-setup-toolchains/gccprobe.cpp b/src/app/qbs-setup-toolchains/gccprobe.cpp
index 3b2f51eaa..e979acf59 100644
--- a/src/app/qbs-setup-toolchains/gccprobe.cpp
+++ b/src/app/qbs-setup-toolchains/gccprobe.cpp
@@ -241,6 +241,8 @@ static QStringList buildCompilerNameFilters(const QString &compilerName)
compilerName + QLatin1String("-[1-9]*"),
// "avr-gcc"
QLatin1String("*-") + compilerName,
+ // "avr-gcc-5.4.0"
+ QLatin1String("*-") + compilerName + QLatin1String("-[1-9]*"),
// "arm-none-eabi-gcc"
QLatin1String("*-*-*-") + compilerName,
// "arm-none-eabi-gcc-9.1.0"