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

CMake: Even less indirection

Browse Source 
Change-Id: If9990f81e4150802dd08e0fc17a1faceb32e0cc6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2022-04-25 14:03:03 +02:00
parent 3fe7a56013
commit 9a6d8aebe7
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,12 +390,11 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
updateConfigurationStateSelection(); updateConfigurationStateSelection();
}); });
connect(buildSystem, &CMakeBuildSystem::configurationCleared, this, [this]() { connect(buildSystem, &CMakeBuildSystem::configurationCleared, this, [this] {
updateConfigurationStateSelection(); updateConfigurationStateSelection();
}); });
connect(m_buildConfiguration, &CMakeBuildConfiguration::errorOccurred, connect(buildSystem, &CMakeBuildSystem::errorOccurred, this, [this] {
this, [this]() {
m_showProgressTimer.stop(); m_showProgressTimer.stop();
m_progressIndicator->hide(); m_progressIndicator->hide();
updateConfigurationStateSelection(); updateConfigurationStateSelection();
@@ -472,11 +471,13 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
connect(m_batchEditButton, &QAbstractButton::clicked, connect(m_batchEditButton, &QAbstractButton::clicked,
this, &CMakeBuildSettingsWidget::batchEditConfiguration); this, &CMakeBuildSettingsWidget::batchEditConfiguration);
connect(bc, &CMakeBuildConfiguration::errorOccurred, this, &CMakeBuildSettingsWidget::setError); connect(buildSystem, &CMakeBuildSystem::errorOccurred,
connect(bc, &CMakeBuildConfiguration::warningOccurred, this, &CMakeBuildSettingsWidget::setWarning); this, &CMakeBuildSettingsWidget::setError);
connect(bc, &CMakeBuildConfiguration::configurationChanged, this, [this](const CMakeConfig &config) { connect(buildSystem, &CMakeBuildSystem::warningOccurred,
m_configModel->setBatchEditConfiguration(config); this, &CMakeBuildSettingsWidget::setWarning);
});
connect(buildSystem, &CMakeBuildSystem::configurationChanged,
m_configModel, &ConfigModel::setBatchEditConfiguration);
updateFromKit(); updateFromKit();
connect(m_buildConfiguration->target(), &Target::kitChanged, connect(m_buildConfiguration->target(), &Target::kitChanged,
@@ -1491,7 +1492,7 @@ void CMakeBuildSystem::setError(const QString &message)
emit buildConfiguration()->enabledChanged(); emit buildConfiguration()->enabledChanged();
} }
TaskHub::addTask(BuildSystemTask(Task::TaskType::Error, message)); TaskHub::addTask(BuildSystemTask(Task::TaskType::Error, message));
emit cmakeBuildConfiguration()->errorOccurred(m_error); emit errorOccurred(m_error);
} }
void CMakeBuildSystem::setWarning(const QString &message) void CMakeBuildSystem::setWarning(const QString &message)
@@ -1500,7 +1501,7 @@ void CMakeBuildSystem::setWarning(const QString &message)
return; return;
m_warning = message; m_warning = message;
TaskHub::addTask(BuildSystemTask(Task::TaskType::Warning, message)); TaskHub::addTask(BuildSystemTask(Task::TaskType::Warning, message));
emit cmakeBuildConfiguration()->warningOccurred(m_warning); emit warningOccurred(m_warning);
} }
QString CMakeBuildSystem::error() const QString CMakeBuildSystem::error() const

3
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
View File

@@ -81,10 +81,7 @@ public:
void filterConfigArgumentsFromAdditionalCMakeArguments(); void filterConfigArgumentsFromAdditionalCMakeArguments();
signals: signals:
void errorOccurred(const QString &message);
void warningOccurred(const QString &message);
void signingFlagsChanged(); void signingFlagsChanged();
void configurationChanged(const CMakeConfig &config);
protected: protected:
bool fromMap(const QVariantMap &map) override; bool fromMap(const QVariantMap &map) override;

2
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -1323,7 +1323,7 @@ void CMakeBuildSystem::updateInitialCMakeExpandableVars()
} }
if (!config.isEmpty()) if (!config.isEmpty())
emit cmakeBuildConfiguration()->configurationChanged(config); emit configurationChanged(config);
} }
} // namespace Internal } // namespace Internal

3
src/plugins/cmakeprojectmanager/cmakebuildsystem.h
View File

@@ -113,6 +113,9 @@ public:
signals: signals:
void configurationCleared(); void configurationCleared();
void configurationChanged(const CMakeConfig &config);
void errorOccurred(const QString &message);
void warningOccurred(const QString &message);
private: private:
enum ForceEnabledChanged { False, True }; enum ForceEnabledChanged { False, True };