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

Drop connections to active target and build config changes

Browse Source 
... for build step related widgets. These are specifig to a build step
which in turn is only interested in its own build config and target.

Change-Id: I5ec277ba279932d18a615e528acffaccdc41e307
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-08-02 15:30:51 +02:00
parent d115276b34
commit 65f2f8a2b4
5 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -449,12 +449,6 @@ CMakeBuildStepConfigWidget::CMakeBuildStepConfigWidget(CMakeBuildStep *buildStep
connect(m_buildStep->buildConfiguration(), &BuildConfiguration::environmentChanged, connect(m_buildStep->buildConfiguration(), &BuildConfiguration::environmentChanged,
this, &CMakeBuildStepConfigWidget::updateDetails); this, &CMakeBuildStepConfigWidget::updateDetails);
connect(m_buildStep->project(), &Project::activeBuildConfigurationChanged,
this, &CMakeBuildStepConfigWidget::updateDetails);
connect(m_buildStep->project(), &Project::activeTargetChanged,
this, &CMakeBuildStepConfigWidget::updateDetails);
} }
void CMakeBuildStepConfigWidget::toolArgumentsEdited() void CMakeBuildStepConfigWidget::toolArgumentsEdited()

9
src/plugins/ios/iosbuildstep.cpp
View File

@@ -121,15 +121,6 @@ public:
connect(m_buildStep->buildConfiguration(), &BuildConfiguration::environmentChanged, connect(m_buildStep->buildConfiguration(), &BuildConfiguration::environmentChanged,
this, &IosBuildStepConfigWidget::updateDetails); this, &IosBuildStepConfigWidget::updateDetails);
Project *pro = m_buildStep->target()->project();
connect(pro, &Project::activeBuildConfigurationChanged,
this, &IosBuildStepConfigWidget::updateDetails);
connect(pro, &Project::activeTargetChanged, this, [this](Target *target) {
if (target && target->isActive())
updateDetails();
});
} }
private: private:

10
src/plugins/ios/iosdsymbuildstep.cpp
View File

@@ -227,8 +227,6 @@ IosDsymBuildStepConfigWidget::IosDsymBuildStepConfigWidget(IosDsymBuildStep *bui
m_ui = new Ui::IosPresetBuildStep; m_ui = new Ui::IosPresetBuildStep;
m_ui->setupUi(this); m_ui->setupUi(this);
Project *pro = m_buildStep->target()->project();
m_ui->commandLineEdit->setText(m_buildStep->command().toString()); m_ui->commandLineEdit->setText(m_buildStep->command().toString());
m_ui->argumentsTextEdit->setPlainText(Utils::QtcProcess::joinArgs( m_ui->argumentsTextEdit->setPlainText(Utils::QtcProcess::joinArgs(
m_buildStep->arguments())); m_buildStep->arguments()));
@@ -248,14 +246,6 @@ IosDsymBuildStepConfigWidget::IosDsymBuildStepConfigWidget(IosDsymBuildStep *bui
this, &IosDsymBuildStepConfigWidget::updateDetails); this, &IosDsymBuildStepConfigWidget::updateDetails);
connect(m_buildStep->buildConfiguration(), &BuildConfiguration::enabledChanged, connect(m_buildStep->buildConfiguration(), &BuildConfiguration::enabledChanged,
this, &IosDsymBuildStepConfigWidget::updateDetails); this, &IosDsymBuildStepConfigWidget::updateDetails);
connect(pro, &Project::activeBuildConfigurationChanged,
this, &IosDsymBuildStepConfigWidget::updateDetails);
connect(pro, &Project::activeTargetChanged, this, [this](Target *target) {
if (target && target->isActive())
updateDetails();
});
} }
IosDsymBuildStepConfigWidget::~IosDsymBuildStepConfigWidget() IosDsymBuildStepConfigWidget::~IosDsymBuildStepConfigWidget()

9
src/plugins/projectexplorer/makestep.cpp
View File

@@ -422,15 +422,6 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
connect(m_makeStep->buildConfiguration(), &BuildConfiguration::buildDirectoryChanged, connect(m_makeStep->buildConfiguration(), &BuildConfiguration::buildDirectoryChanged,
this, &MakeStepConfigWidget::updateDetails); this, &MakeStepConfigWidget::updateDetails);
const auto pro = m_makeStep->project();
connect(pro, &Project::activeBuildConfigurationChanged,
this, &MakeStepConfigWidget::updateDetails);
connect(pro, &Project::activeTargetChanged, this, [this](Target *target) {
if (target && target->isActive())
updateDetails();
});
Core::VariableChooser::addSupportForChildWidgets(this, m_makeStep->macroExpander()); Core::VariableChooser::addSupportForChildWidgets(this, m_makeStep->macroExpander());
} }

8
src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp
View File

@@ -149,14 +149,6 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc)
connect(bc, &BuildConfiguration::enabledChanged, connect(bc, &BuildConfiguration::enabledChanged,
this, &QmakeProjectConfigWidget::environmentChanged); this, &QmakeProjectConfigWidget::environmentChanged);
connect(project, &Project::activeBuildConfigurationChanged,
this, &QmakeProjectConfigWidget::environmentChanged);
connect(project, &Project::activeTargetChanged, this, [this](Target *target) {
if (target && target->isActive())
environmentChanged();
});
auto qmakeProject = static_cast<QmakeProject *>(bc->target()->project()); auto qmakeProject = static_cast<QmakeProject *>(bc->target()->project());
connect(qmakeProject, &QmakeProject::buildDirectoryInitialized, connect(qmakeProject, &QmakeProject::buildDirectoryInitialized,
this, &QmakeProjectConfigWidget::updateProblemLabel); this, &QmakeProjectConfigWidget::updateProblemLabel);