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

Maemo: Fix crash in run config with non-Maemo deploy configuration.

Browse Source
This commit is contained in:
Christian Kandeler
2011-04-07 15:26:08 +02:00
parent c1dda9a75a
commit 84babcb2bf
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
View File

@@ -120,6 +120,8 @@ public:
template<class T> static T *earlierBuildStep(const ProjectExplorer::DeployConfiguration *dc, template<class T> static T *earlierBuildStep(const ProjectExplorer::DeployConfiguration *dc,
const ProjectExplorer::BuildStep *laterBuildStep) const ProjectExplorer::BuildStep *laterBuildStep)
{ {
if (!dc)
return 0;
const ProjectExplorer::BuildStepList * const bsl = dc->stepList(); const ProjectExplorer::BuildStepList * const bsl = dc->stepList();
const QList<ProjectExplorer::BuildStep *> &buildSteps = bsl->steps(); const QList<ProjectExplorer::BuildStep *> &buildSteps = bsl->steps();
for (int i = 0; i < buildSteps.count(); ++i) { for (int i = 0; i < buildSteps.count(); ++i) {

2
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View File

@@ -310,7 +310,7 @@ QString MaemoRunConfiguration::remoteExecutableFilePath() const
MaemoPortList MaemoRunConfiguration::freePorts() const MaemoPortList MaemoRunConfiguration::freePorts() const
{ {
return deployStep()->freePorts(); return deployStep() ? deployStep()->freePorts() : MaemoPortList();
} }
bool MaemoRunConfiguration::useRemoteGdb() const bool MaemoRunConfiguration::useRemoteGdb() const