diff options
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 56726d774d..07163b54c1 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -257,7 +257,7 @@ QString AndroidManager::buildTargetSDK(const Target *target) QStringList AndroidManager::applicationAbis(const Target *target) { auto qt = static_cast<AndroidQtVersion *>(QtSupport::QtKitAspect::qtVersion(target->kit())); - return qt->androidAbis(); + return qt ? qt->androidAbis() : QStringList(); } QString AndroidManager::archTriplet(const QString &abi) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 84312316a3..b573119538 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -164,7 +164,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Utils::Id id) initialArgs.append(QString::fromLatin1("-DANDROID_ABI:STRING=%1").arg(preferredAbi)); QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(k); - if (qt->qtVersion() >= QtSupport::QtVersionNumber{5, 14, 0}) { + if (qt && qt->qtVersion() >= QtSupport::QtVersionNumber{5, 14, 0}) { auto sdkLocation = bs->data(Android::Constants::SdkLocation).value<FilePath>(); initialArgs.append( QString::fromLatin1("-DANDROID_SDK:PATH=%1").arg(sdkLocation.toString())); |