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

CompilationDatabase: Create target in the same thread

Browse Source 
Causes a warning otherwise.

Change-Id: I040c3298e7c0898364b49ff4c6605f11f01c538f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-11-02 10:00:20 +01:00
parent 6cdcae528d
commit fb25bd53c1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
View File

@@ -302,8 +302,6 @@ void CompilationDatabaseProject::buildTreeAndProjectParts(const Utils::FileName
setRootProjectNode(std::move(root)); setRootProjectNode(std::move(root));
addTarget(createTarget(m_kit.get()));
m_cppCodeModelUpdater->update({this, cToolchain, cxxToolchain, m_kit.get(), rpps}); m_cppCodeModelUpdater->update({this, cToolchain, cxxToolchain, m_kit.get(), rpps});
emitParsingFinished(true); emitParsingFinished(true);
@@ -321,6 +319,9 @@ CompilationDatabaseProject::CompilationDatabaseProject(const Utils::FileName &pr
m_kit.reset(KitManager::defaultKit()->clone()); m_kit.reset(KitManager::defaultKit()->clone());
connect(this, &CompilationDatabaseProject::parsingFinished,
this, [this]() { addTarget(createTarget(m_kit.get())); });
emitParsingStarted(); emitParsingStarted();
const QFuture<void> future = ::Utils::runAsync([this, projectFile](){ const QFuture<void> future = ::Utils::runAsync([this, projectFile](){