diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2017-09-28 11:32:39 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2017-10-06 09:53:40 +0000 |
commit | 02533e61cf617157257e048fc79812c4fb880f35 (patch) | |
tree | 95aa2e90746adb1ed1089423cf49e7ea9b514877 /src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp | |
parent | 1fa26bd9b3dd5269dc44a000cd525e26e6904328 (diff) |
CMake: Fix project parsing notification
This builds on top of 08677c0b014cc44d944e32d462f502a67c948404 and
fixes one more code path to go through a common entry/exit point.
Change-Id: I1d00fa9242f247028e5d3b0ef3b5fe1d3f4cb03d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp index 8985a0799e..3dd52c0bed 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp @@ -227,13 +227,13 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc) if (m_buildConfiguration->isParsing()) m_showProgressTimer.start(); else { - m_configModel->setConfiguration(m_buildConfiguration->completeCMakeConfiguration()); + m_configModel->setConfiguration(m_buildConfiguration->configurationFromCMake()); m_configView->expandAll(); } - connect(m_buildConfiguration->target()->project(), &ProjectExplorer::Project::parsingFinished, + connect(project, &ProjectExplorer::Project::parsingFinished, this, [this, buildDirChooser, stretcher]() { - m_configModel->setConfiguration(m_buildConfiguration->completeCMakeConfiguration()); + m_configModel->setConfiguration(m_buildConfiguration->configurationFromCMake()); m_configView->expandAll(); stretcher->stretch(); updateButtonState(); @@ -264,7 +264,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc) connect(m_resetButton, &QPushButton::clicked, m_configModel, &ConfigModel::resetAllChanges); connect(m_reconfigureButton, &QPushButton::clicked, this, [this]() { - m_buildConfiguration->setCurrentCMakeConfiguration(m_configModel->configurationChanges()); + m_buildConfiguration->setConfigurationForCMake(m_configModel->configurationChanges()); }); connect(m_editButton, &QPushButton::clicked, this, [this]() { QModelIndex idx = m_configView->currentIndex(); |