From 2d520140d01a8c6d9ff88c7f7205dfa28cc06d2d Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Wed, 24 Apr 2019 14:07:39 +0200
Subject: Clang: Fix system pre include search path

We now get the resource path from creator. The -fPIC case is working now
too.

Change-Id: Id191e89e6d46706748d50440038a06a349972cc9
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
---
 .../source/symbolindexing.h                        | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'src/tools/clangrefactoringbackend/source/symbolindexing.h')

diff --git a/src/tools/clangrefactoringbackend/source/symbolindexing.h b/src/tools/clangrefactoringbackend/source/symbolindexing.h
index 10df4e397b..d4e36499b1 100644
--- a/src/tools/clangrefactoringbackend/source/symbolindexing.h
+++ b/src/tools/clangrefactoringbackend/source/symbolindexing.h
@@ -85,7 +85,8 @@ public:
     SymbolIndexing(Sqlite::Database &database,
                    FilePathCachingInterface &filePathCache,
                    const GeneratedFiles &generatedFiles,
-                   ProgressCounter::SetProgressCallback &&setProgressCallback)
+                   ProgressCounter::SetProgressCallback &&setProgressCallback,
+                   const Environment &environment)
         : m_filePathCache(filePathCache)
         , m_buildDependencyStorage(database)
         , m_precompiledHeaderStorage(database)
@@ -93,6 +94,17 @@ public:
         , m_symbolStorage(database)
         , m_collectorManger(generatedFiles, database)
         , m_progressCounter(std::move(setProgressCallback))
+        , m_indexer(m_indexerQueue,
+                    m_symbolStorage,
+                    m_buildDependencyStorage,
+                    m_precompiledHeaderStorage,
+                    m_sourceWatcher,
+                    m_filePathCache,
+                    m_fileStatusCache,
+                    m_symbolStorage.database,
+                    m_projectPartsStorage,
+                    m_modifiedTimeChecker,
+                    environment)
         , m_indexerScheduler(m_collectorManger,
                              m_indexerQueue,
                              m_progressCounter,
@@ -139,16 +151,7 @@ private:
         }};
     ModifiedTimeChecker<ClangBackEnd::SourceTimeStamps> m_modifiedTimeChecker{getModifiedTime,
                                                                               m_filePathCache};
-    SymbolIndexer m_indexer{m_indexerQueue,
-                            m_symbolStorage,
-                            m_buildDependencyStorage,
-                            m_precompiledHeaderStorage,
-                            m_sourceWatcher,
-                            m_filePathCache,
-                            m_fileStatusCache,
-                            m_symbolStorage.database,
-                            m_projectPartsStorage,
-                            m_modifiedTimeChecker};
+    SymbolIndexer m_indexer;
     SymbolIndexerTaskQueue m_indexerQueue{m_indexerScheduler, m_progressCounter};
     SymbolIndexerTaskScheduler m_indexerScheduler;
 };
-- 
cgit v1.2.1