diff options
| author | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-09-30 15:38:30 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-09-30 15:24:31 +0000 |
| commit | 47654d6d73c8fa18a918b06683020cfad4e6fd02 (patch) | |
| tree | 934dcae0c97bfbb108c8427a38f4f0d9b9d1891f | |
| parent | 7740c31746efc7eabb74ed22802f8c88711a0aba (diff) | |
| download | qt-creator-47654d6d73c8fa18a918b06683020cfad4e6fd02.tar.gz | |
UiCodeModelSupport: Fix crash when removing kit
Change-Id: I30c5c9f2456e911d01376b1c06f2255a95080897
Task-number: QTCREATORBUG-15120
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
| -rw-r--r-- | src/plugins/qtsupport/uicodemodelsupport.cpp | 10 |
1 files 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(); } |