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

Clang: Fix build of clangpchmanagerbackend

Browse Source 
Change-Id: I6cbdc17326df1c93c20fa71dc48836d47a109703
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-01-28 14:00:30 +01:00
committed by Ivan Donchevskii
parent 381d2de834
commit 7e65693e31
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp
View File

@@ -135,11 +135,13 @@ public:
PchCreatorManager(const ClangBackEnd::GeneratedFiles &generatedFiles, PchCreatorManager(const ClangBackEnd::GeneratedFiles &generatedFiles,
ClangBackEnd::Environment &environment, ClangBackEnd::Environment &environment,
Sqlite::Database &database, Sqlite::Database &database,
PchManagerServer &pchManagerServer) PchManagerServer &pchManagerServer,
ClangBackEnd::ClangPathWatcherInterface &pathWatcher)
: ProcessorManager(generatedFiles), : ProcessorManager(generatedFiles),
m_environment(environment), m_environment(environment),
m_database(database), m_database(database),
m_pchManagerServer(pchManagerServer) m_pchManagerServer(pchManagerServer),
m_pathWatcher(pathWatcher)
{} {}
protected: protected:
@@ -147,13 +149,15 @@ protected:
{ {
return std::make_unique<PchCreator>(m_environment, return std::make_unique<PchCreator>(m_environment,
m_database, m_database,
*m_pchManagerServer.client()); *m_pchManagerServer.client(),
m_pathWatcher);
} }
private: private:
ClangBackEnd::Environment &m_environment; ClangBackEnd::Environment &m_environment;
Sqlite::Database &m_database; Sqlite::Database &m_database;
ClangBackEnd::PchManagerServer &m_pchManagerServer; ClangBackEnd::PchManagerServer &m_pchManagerServer;
ClangBackEnd::ClangPathWatcherInterface &m_pathWatcher;
}; };
struct Data // because we have a cycle dependency struct Data // because we have a cycle dependency
@@ -171,7 +175,11 @@ struct Data // because we have a cycle dependency
ApplicationEnvironment environment; ApplicationEnvironment environment;
ProjectParts projectParts; ProjectParts projectParts;
GeneratedFiles generatedFiles; GeneratedFiles generatedFiles;
PchCreatorManager pchCreatorManager{generatedFiles, environment, database, clangPchManagerServer}; PchCreatorManager pchCreatorManager{generatedFiles,
environment,
database,
clangPchManagerServer,
includeWatcher};
PrecompiledHeaderStorage<> preCompiledHeaderStorage{database}; PrecompiledHeaderStorage<> preCompiledHeaderStorage{database};
ClangBackEnd::ProgressCounter progressCounter{ ClangBackEnd::ProgressCounter progressCounter{
[&](int progress, int total) { clangPchManagerServer.setProgress(progress, total); }}; [&](int progress, int total) { clangPchManagerServer.setProgress(progress, total); }};