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

BuildSteps: Fix a number of crashes

Browse Source 
Fix crashes due to activeProjectConfigurationChanged signal sending
a nullptr.

Uses the same fix as QTCREATORBUG-18865, but in more places:-)

Task-number: QTCREATORBUG-18866
Change-Id: Ic71af5ed26b2a44339f0c687f3f46bfdf62c2489
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-09-08 12:02:17 +02:00
parent a9aac73e37
commit 43c04ac80b
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotoolsprojectmanager/makestep.cpp
View File

@@ -242,7 +242,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep) :
}); });
connect(makeStep->project(), &Project::activeProjectConfigurationChanged, connect(makeStep->project(), &Project::activeProjectConfigurationChanged,
this, [this](ProjectConfiguration *pc) { this, [this](ProjectConfiguration *pc) {
if (pc->isActive()) if (pc && pc->isActive())
updateDetails(); updateDetails();
}); });
} }

2
src/plugins/genericprojectmanager/genericmakestep.cpp
View File

@@ -258,7 +258,7 @@ GenericMakeStepConfigWidget::GenericMakeStepConfigWidget(GenericMakeStep *makeSt
}); });
connect(pro, &Project::activeProjectConfigurationChanged, connect(pro, &Project::activeProjectConfigurationChanged,
this, [this](ProjectConfiguration *pc) { this, [this](ProjectConfiguration *pc) {
if (pc->isActive()) { if (pc && pc->isActive()) {
updateMakeOverrideLabel(); updateMakeOverrideLabel();
updateDetails(); updateDetails();
} }

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

@@ -266,7 +266,7 @@ IosBuildStepConfigWidget::IosBuildStepConfigWidget(IosBuildStep *buildStep)
}); });
connect(pro, &Project::activeProjectConfigurationChanged, connect(pro, &Project::activeProjectConfigurationChanged,
this, [this](ProjectConfiguration *pc) { this, [this](ProjectConfiguration *pc) {
if (pc->isActive()) if (pc && pc->isActive())
updateDetails(); updateDetails();
}); });
} }

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

@@ -266,7 +266,7 @@ IosPresetBuildStepConfigWidget::IosPresetBuildStepConfigWidget(IosPresetBuildSte
}); });
connect(pro, &Project::activeProjectConfigurationChanged, connect(pro, &Project::activeProjectConfigurationChanged,
this, [this](ProjectConfiguration *pc) { this, [this](ProjectConfiguration *pc) {
if (pc->isActive()) if (pc && pc->isActive())
updateDetails(); updateDetails();
}); });
} }

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

@@ -146,7 +146,7 @@ QbsProject::QbsProject(const FileName &fileName) :
}); });
connect(this, &Project::activeProjectConfigurationChanged, connect(this, &Project::activeProjectConfigurationChanged,
this, [this](ProjectConfiguration *pc) { this, [this](ProjectConfiguration *pc) {
if (pc->isActive()) if (pc && pc->isActive())
startParsing(); startParsing();
}); });

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

@@ -104,7 +104,7 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc)
}); });
connect(project, &Project::activeProjectConfigurationChanged, connect(project, &Project::activeProjectConfigurationChanged,
this, [this](ProjectConfiguration *pc) { this, [this](ProjectConfiguration *pc) {
if (pc->isActive()) if (pc && pc->isActive())
environmentChanged(); environmentChanged();
}); });
connect(project, &QmakeProject::buildDirectoryInitialized, connect(project, &QmakeProject::buildDirectoryInitialized,