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

fix a crash if no qt version is set for a project

Browse Source 
Change-Id: I554288078fb472352a3a93e689c859e05d72e67e
Merge-request: 337
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3000
This commit is contained in:
Benito van der Zander
2011-08-16 10:20:44 +00:00
committed by Tobias Hunger
parent 8c7e8966b8
commit bbdd17abbc
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
View File

@@ -176,8 +176,14 @@ bool S60EmulatorRunConfiguration::fromMap(const QVariantMap &map)
QString S60EmulatorRunConfiguration::executable() const QString S60EmulatorRunConfiguration::executable() const
{ {
if (!qt4Target())
return QString();
Qt4BuildConfiguration *qt4bc = qt4Target()->activeBuildConfiguration(); Qt4BuildConfiguration *qt4bc = qt4Target()->activeBuildConfiguration();
if (!qt4bc)
return QString();
QtSupport::BaseQtVersion *qtVersion = qt4bc->qtVersion(); QtSupport::BaseQtVersion *qtVersion = qt4bc->qtVersion();
if (!qtVersion)
return QString();
QString baseDir = qtVersion->systemRoot(); QString baseDir = qtVersion->systemRoot();
QString qmakeBuildConfig = "urel"; QString qmakeBuildConfig = "urel";
if (qt4bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild) if (qt4bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild)