summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@theqtcompany.com>2015-06-16 15:25:54 +0200
committerTobias Hunger <tobias.hunger@theqtcompany.com>2015-06-17 07:26:06 +0000
commit274f1c0e80d57b401440cf49b08bac523e56fe1f (patch)
tree7de16ec0467ae9465d597a00a9eebdf52f7a6d8e
parent6cd5df7587146da3f1f041cc06eb03afc203637c (diff)
downloadqt-creator-274f1c0e80d57b401440cf49b08bac523e56fe1f.tar.gz
Android: Fix possible crash
This can apparently get triggered with qbs projects. Task-number: QTCREATORBUG-14493 Change-Id: Id645fbad1a0b9fdff1d1840f8ba5821b3be56b7d Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
-rw-r--r--src/plugins/android/androiddeployconfiguration.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/androiddeployconfiguration.cpp b/src/plugins/android/androiddeployconfiguration.cpp
index b538bb511a..faf4ed6ec2 100644
--- a/src/plugins/android/androiddeployconfiguration.cpp
+++ b/src/plugins/android/androiddeployconfiguration.cpp
@@ -122,7 +122,7 @@ QList<Core::Id> AndroidDeployConfigurationFactory::availableCreationIds(Target *
return ids;
QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(parent->kit());
- if (qt->type() != QLatin1String(Constants::ANDROIDQT))
+ if (!qt || qt->type() != QLatin1String(Constants::ANDROIDQT))
return ids;
ids << Core::Id(ANDROID_DEPLOYCONFIGURATION_ID);
return ids;