From bbdd17abbce27fb43f2f34ddf4eb79390bdf058b Mon Sep 17 00:00:00 2001 From: Benito van der Zander Date: Tue, 16 Aug 2011 10:20:44 +0000 Subject: [PATCH] fix a crash if no qt version is set for a project Change-Id: I554288078fb472352a3a93e689c859e05d72e67e Merge-request: 337 Reviewed-by: Tobias Hunger Reviewed-on: http://codereview.qt.nokia.com/3000 --- .../qt-s60/s60emulatorrunconfiguration.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp index f98d60b7a63..f2a3597f060 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp @@ -176,8 +176,14 @@ bool S60EmulatorRunConfiguration::fromMap(const QVariantMap &map) QString S60EmulatorRunConfiguration::executable() const { + if (!qt4Target()) + return QString(); Qt4BuildConfiguration *qt4bc = qt4Target()->activeBuildConfiguration(); + if (!qt4bc) + return QString(); QtSupport::BaseQtVersion *qtVersion = qt4bc->qtVersion(); + if (!qtVersion) + return QString(); QString baseDir = qtVersion->systemRoot(); QString qmakeBuildConfig = "urel"; if (qt4bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild)