aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kde.org>2021-12-08 13:39:38 +0200
committerBogDan Vatra <bogdan@kdab.com>2021-12-10 09:48:56 +0000
commitd7f68ba17449babadfa12437d4fbe31f29d902b9 (patch)
tree1c3bc12dc132bfcf93fadc456f3b84821a8f9638
parentaa0f57b52af1599bc046ab1ea1d05e4168f15dc0 (diff)
Fix LLVM tools version query
On Debian clang tools are prefixed with "Debian ": $ clang-tidy --version Debian LLVM version 13.0.0 Optimized build. Default target: x86_64-pc-linux-gnu Host CPU: bdver2 Change-Id: I03886d2674a3851c0cf391afc1c1672b0349184e Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/plugins/clangtools/executableinfo.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/clangtools/executableinfo.cpp b/src/plugins/clangtools/executableinfo.cpp
index 593615ec1f..45b2ea8e2c 100644
--- a/src/plugins/clangtools/executableinfo.cpp
+++ b/src/plugins/clangtools/executableinfo.cpp
@@ -228,8 +228,9 @@ QString queryVersion(const FilePath &clangToolPath, QueryFailMode failMode)
static const QStringList versionPrefixes{"LLVM version ", "clang version: "};
const QString line = stream.readLine().simplified();
for (const QString &prefix : versionPrefixes) {
- if (line.startsWith(prefix))
- return line.mid(prefix.length());
+ auto idx = line.indexOf(prefix);
+ if (idx >= 0)
+ return line.mid(idx + prefix.length());
}
}
return {};