feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: I80fe565749ad5c06dfe99436f2dc6ab4b66a2537
This commit is contained in:
Eike Ziller
2021-12-16 10:50:33 +01:00
parent 7c674e0a5b 21c1d8fd60
commit 85b60d9608
156 changed files with 2801 additions and 1439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/clangtools/executableinfo.cpp
View File

@@ -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 {};