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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp

Change-Id: I1583fa81adc0218ad4657baa347c08e9e29f88e6
This commit is contained in:
Eike Ziller
2020-05-15 14:49:11 +02:00
parent 7414a47825 921b56cd46
commit 52b7ec058b
64 changed files with 650 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -476,7 +476,7 @@ void QbsBuildSystem::updateProjectNodes(const std::function<void ()> &continuati
m_treeCreationWatcher = new TreeCreationWatcher(this);
connect(m_treeCreationWatcher, &TreeCreationWatcher::finished, this,
[this, watcher = m_treeCreationWatcher, continuation] {
std::unique_ptr<QbsProjectNode> rootNode(m_treeCreationWatcher->result());
std::unique_ptr<QbsProjectNode> rootNode(watcher->result());
if (watcher != m_treeCreationWatcher) {
watcher->deleteLater();
return;