From fb25bd53c118490935db377e3948297ed44cf2c0 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Fri, 2 Nov 2018 10:00:20 +0100 Subject: [PATCH] CompilationDatabase: Create target in the same thread Causes a warning otherwise. Change-Id: I040c3298e7c0898364b49ff4c6605f11f01c538f Reviewed-by: Christian Stenger Reviewed-by: Nikolai Kosjar --- .../compilationdatabaseproject.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index 2da1135fe41..48a3879d621 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -302,8 +302,6 @@ void CompilationDatabaseProject::buildTreeAndProjectParts(const Utils::FileName setRootProjectNode(std::move(root)); - addTarget(createTarget(m_kit.get())); - m_cppCodeModelUpdater->update({this, cToolchain, cxxToolchain, m_kit.get(), rpps}); emitParsingFinished(true); @@ -321,6 +319,9 @@ CompilationDatabaseProject::CompilationDatabaseProject(const Utils::FileName &pr m_kit.reset(KitManager::defaultKit()->clone()); + connect(this, &CompilationDatabaseProject::parsingFinished, + this, [this]() { addTarget(createTarget(m_kit.get())); }); + emitParsingStarted(); const QFuture future = ::Utils::runAsync([this, projectFile](){