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

CMakePM: Fix having duplicate CMAKE_CXX_COMPILERS entries

Browse Source 
Do not apply the changes directly to the model, cache and then apply at
the right time.

Fixes: QTCREATORBUG-27005
Change-Id: Id099f21196900cd0e9787ac27887f2eec36f8045
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2024-06-27 13:47:30 +02:00
parent 3572fdce03
commit e2be8f9d16
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -158,6 +158,7 @@ private:
QPushButton *m_batchEditButton = nullptr; QPushButton *m_batchEditButton = nullptr;
QPushButton *m_kitConfiguration = nullptr; QPushButton *m_kitConfiguration = nullptr;
CMakeConfig m_configurationChanges;
}; };
static QModelIndex mapToSource(const QAbstractItemView *view, const QModelIndex &idx) static QModelIndex mapToSource(const QAbstractItemView *view, const QModelIndex &idx)
@@ -416,6 +417,11 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
updateButtonState(); updateButtonState();
m_showProgressTimer.stop(); m_showProgressTimer.stop();
m_progressIndicator->hide(); m_progressIndicator->hide();
if (!m_configurationChanges.isEmpty()) {
m_configModel->setBatchEditConfiguration(m_configurationChanges);
m_configurationChanges.clear();
}
updateConfigurationStateSelection(); updateConfigurationStateSelection();
}); });
@@ -502,8 +508,9 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
connect(bs, &CMakeBuildSystem::warningOccurred, connect(bs, &CMakeBuildSystem::warningOccurred,
this, &CMakeBuildSettingsWidget::setWarning); this, &CMakeBuildSettingsWidget::setWarning);
connect(bs, &CMakeBuildSystem::configurationChanged, connect(bs, &CMakeBuildSystem::configurationChanged, this, [this](const CMakeConfig &config) {
m_configModel, &ConfigModel::setBatchEditConfiguration); m_configurationChanges = config;
});
updateFromKit(); updateFromKit();
connect(m_buildConfig->target(), &Target::kitChanged, connect(m_buildConfig->target(), &Target::kitChanged,