From 47654d6d73c8fa18a918b06683020cfad4e6fd02 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 30 Sep 2015 15:38:30 +0200 Subject: UiCodeModelSupport: Fix crash when removing kit Change-Id: I30c5c9f2456e911d01376b1c06f2255a95080897 Task-number: QTCREATORBUG-15120 Reviewed-by: Tobias Hunger --- src/plugins/qtsupport/uicodemodelsupport.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/qtsupport/uicodemodelsupport.cpp b/src/plugins/qtsupport/uicodemodelsupport.cpp index 358784c1b9..590efafc56 100644 --- a/src/plugins/qtsupport/uicodemodelsupport.cpp +++ b/src/plugins/qtsupport/uicodemodelsupport.cpp @@ -251,12 +251,12 @@ void UiCodeModelSupport::updateFromBuild() QString UiCodeModelSupport::uicCommand() const { QtSupport::BaseQtVersion *version; - if (m_project->needsConfiguration()) { - version = QtSupport::QtKitInformation::qtVersion(ProjectExplorer::KitManager::defaultKit()); - } else { - ProjectExplorer::Target *target = m_project->activeTarget(); + ProjectExplorer::Target *target; + if (!m_project->needsConfiguration() + && (target = m_project->activeTarget())) version = QtSupport::QtKitInformation::qtVersion(target->kit()); - } + else + version = QtSupport::QtKitInformation::qtVersion(ProjectExplorer::KitManager::defaultKit()); return version ? version->uicCommand() : QString(); } -- cgit v1.2.1