Clang: Consolidate all ClangCompilerOptionsBuilder into one implementation

We used the same code in different but don't shared it. From a bug fixing
perspective it's actually not that smart.

Change-Id: Iaaffc883229e259ff77f95b5cf0a8f0d8b5117df
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

1 files changed, 9 insertions, 5 deletions

diff --git a/src/plugins/clangrefactoring/clangqueryprojectsfindfilter.cpp b/src/plugins/clangrefactoring/clangqueryprojectsfindfilter.cpp
index 012de8cdc03..b4914eae2b5 100644
--- a/src/plugins/clangrefactoring/clangqueryprojectsfindfilter.cpp
+++ b/src/plugins/clangrefactoring/clangqueryprojectsfindfilter.cpp
@@ -27,12 +27,13 @@
 
 #include "projectpartutilities.h"
 #include "refactoringclient.h"
-#include "refactoringcompileroptionsbuilder.h"
 #include "searchinterface.h"
 
 #include <refactoringserverinterface.h>
 #include <requestsourcerangesanddiagnosticsforquerymessage.h>
 
+#include <cpptools/clangcompileroptionsbuilder.h>
+
 namespace ClangRefactoring {
 
 ClangQueryProjectsFindFilter::ClangQueryProjectsFindFilter(
@@ -112,11 +113,14 @@ Utils::SmallStringVector createCommandLine(CppTools::ProjectPart *projectPart,
                                            const QString &documentFilePath,
                                            CppTools::ProjectFile::Kind fileKind)
 {
-    using ClangRefactoring::RefactoringCompilerOptionsBuilder;
+    using CppTools::ClangCompilerOptionsBuilder;
 
-    auto commandLine = RefactoringCompilerOptionsBuilder::build(projectPart,
-                                                                fileKind,
-                                                                CppTools::CompilerOptionsBuilder::PchUsage::None);
+    Utils::SmallStringVector commandLine{ClangCompilerOptionsBuilder::build(
+                    projectPart,
+                    fileKind,
+                    CppTools::CompilerOptionsBuilder::PchUsage::None,
+                    CLANG_VERSION,
+                    CLANG_RESOURCE_DIR)};
 
     commandLine.push_back(documentFilePath);