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

Fix potential crash in updateSimulatorInformation.

Browse Source
This commit is contained in:
kh1
2009-11-30 10:55:48 +01:00
parent 96a66661b4
commit 615105cccd
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -492,19 +492,23 @@ const MaemoToolChain *MaemoRunConfiguration::toolchain() const
const QString MaemoRunConfiguration::gdbCmd() const
{
return toolchain() != 0
? toolchain()->targetRoot() + "/bin/gdb"
: QString();
if (const MaemoToolChain *tc = toolchain())
return tc->targetRoot() + "/bin/gdb";
return QString();
}
QString MaemoRunConfiguration::maddeRoot() const
{
return toolchain() != 0 ? toolchain()->maddeRoot() : QString();
if (const MaemoToolChain *tc = toolchain())
tc->maddeRoot();
return QString();
}
const QString MaemoRunConfiguration::sysRoot() const
{
return toolchain() != 0 ? toolchain()->sysrootRoot() : QString();
if (const MaemoToolChain *tc = toolchain())
return toolchain()->sysrootRoot();
return QString();
}
const QStringList MaemoRunConfiguration::arguments() const
@@ -764,8 +768,10 @@ void MaemoRunConfiguration::updateSimulatorInformation()
m_visibleSimulatorParameter = tr("Could not autodetect target simulator, "
"please choose one on your own.");
if (!m_isUserSetSimulator)
m_simulatorPath = QDir::toNativeSeparators(toolchain()->simulatorRoot());
if (!m_isUserSetSimulator) {
if (const MaemoToolChain *tc = toolchain())
m_simulatorPath = QDir::toNativeSeparators(tc->simulatorRoot());
}
if (!m_simulatorPath.isEmpty()) {
m_visibleSimulatorParameter = tr("'%1' is not a valid Maemo simulator.")