ClangTools: Invoke clang-tidy instead of clang

Change-Id: Ibcc53cf8cb8bbaf262757bec52f15936506dad50
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

1 files changed, 13 insertions, 3 deletions

diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 4341a0d20f..b16d1d05c4 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -476,15 +476,25 @@ QString ICore::clangIncludeDirectory(const QString &clangVersion, const QString
     return QDir::toNativeSeparators(dir.canonicalPath());
 }
 
-QString ICore::clangExecutable(const QString &clangBinDirectory)
+static QString clangBinary(const QString &binaryBaseName, const QString &clangBinDirectory)
 {
     const QString hostExeSuffix(QTC_HOST_EXE_SUFFIX);
-    QFileInfo executable(libexecPath() + "/clang/bin/clang" + hostExeSuffix);
+    QFileInfo executable(ICore::libexecPath() + "/clang/bin/" + binaryBaseName + hostExeSuffix);
     if (!executable.exists())
-        executable = QFileInfo(clangBinDirectory + "/clang" + hostExeSuffix);
+        executable = QFileInfo(clangBinDirectory + "/" + binaryBaseName + hostExeSuffix);
     return QDir::toNativeSeparators(executable.canonicalFilePath());
 }
 
+QString ICore::clangExecutable(const QString &clangBinDirectory)
+{
+    return clangBinary("clang", clangBinDirectory);
+}
+
+QString ICore::clangTidyExecutable(const QString &clangBinDirectory)
+{
+    return clangBinary("clang-tidy", clangBinDirectory);
+}
+
 static QString compilerString()
 {
 #if defined(Q_CC_CLANG) // must be before GNU, because clang claims to be GNU too