From a79b32fefab835bd6e79040e59bf293ef3b4e59a Mon Sep 17 00:00:00 2001
From: Ivan Donchevskii <ivan.donchevskii@qt.io>
Date: Wed, 8 Aug 2018 14:01:04 +0200
Subject: [PATCH] Clang: Fix resource directory path

Effected clang tools in developer builds.

Change-Id: I3ecbc38f37fa2a41f3777f402fd7fe5bf5ba7e94
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
---
 src/plugins/clangtools/clangtoolruncontrol.cpp | 15 ++++++---------
 src/plugins/clangtools/clangtoolruncontrol.h   |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp
index cc25d5124d2..8e33d18b3a0 100644
--- a/src/plugins/clangtools/clangtoolruncontrol.cpp
+++ b/src/plugins/clangtools/clangtoolruncontrol.cpp
@@ -185,16 +185,14 @@ private:
      bool m_success = false;
 };
 
-static AnalyzeUnits toAnalyzeUnits(const FileInfos &fileInfos,
-                                   const QString &clangVersion,
-                                   const QString &clangResourceDirectory)
+static AnalyzeUnits toAnalyzeUnits(const FileInfos &fileInfos)
 {
     AnalyzeUnits unitsToAnalyze;
     const CompilerOptionsBuilder::PchUsage pchUsage = CppTools::getPchUsage();
     for (const FileInfo &fileInfo : fileInfos) {
         CompilerOptionsBuilder optionsBuilder(*fileInfo.projectPart,
-                                              clangVersion,
-                                              clangResourceDirectory);
+                                              CLANG_VERSION,
+                                              CLANG_RESOURCE_DIR);
         QStringList arguments = extraClangToolsPrependOptions();
         arguments.append(optionsBuilder.build(fileInfo.kind, pchUsage));
         arguments.append(extraClangToolsAppendOptions());
@@ -204,12 +202,11 @@ static AnalyzeUnits toAnalyzeUnits(const FileInfos &fileInfos,
     return unitsToAnalyze;
 }
 
-AnalyzeUnits ClangToolRunControl::unitsToAnalyze(const QString &clangVersion)
+AnalyzeUnits ClangToolRunControl::unitsToAnalyze()
 {
     QTC_ASSERT(m_projectInfo.isValid(), return AnalyzeUnits());
 
-    const QString clangResourceDirectory = clangIncludeDirectory(m_clangExecutable, clangVersion);
-    return toAnalyzeUnits(m_fileInfos, clangVersion, clangResourceDirectory);
+    return toAnalyzeUnits(m_fileInfos);
 }
 
 static QDebug operator<<(QDebug debug, const Utils::Environment &environment)
@@ -311,7 +308,7 @@ void ClangToolRunControl::start()
     }
 
     // Collect files
-    const AnalyzeUnits unitsToProcess = unitsToAnalyze(CLANG_VERSION);
+    const AnalyzeUnits unitsToProcess = unitsToAnalyze();
     qCDebug(LOG) << "Files to process:" << unitsToProcess;
     m_unitsToProcess = unitsToProcess;
     m_initialFilesToProcessSize = m_unitsToProcess.count();
diff --git a/src/plugins/clangtools/clangtoolruncontrol.h b/src/plugins/clangtools/clangtoolruncontrol.h
index 65f4bf35d0d..dd5a95662ef 100644
--- a/src/plugins/clangtools/clangtoolruncontrol.h
+++ b/src/plugins/clangtools/clangtoolruncontrol.h
@@ -77,7 +77,7 @@ private:
     void start() final;
     void stop() final;
 
-    AnalyzeUnits unitsToAnalyze(const QString &clangVersion);
+    AnalyzeUnits unitsToAnalyze();
     void analyzeNextFile();
 
     void handleFinished();