feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Prevent crash in case there is no Qt version set

Browse Source 
For CMake build.

Change-Id: I77946a5d7023a9cefc23baf243991949121e49ec
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-06-25 15:17:50 +02:00
parent dbb70c4f83
commit b60ab85c13
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidmanager.cpp
View File

@@ -257,7 +257,7 @@ QString AndroidManager::buildTargetSDK(const Target *target)
QStringList AndroidManager::applicationAbis(const Target *target) QStringList AndroidManager::applicationAbis(const Target *target)
{ {
auto qt = static_cast<AndroidQtVersion *>(QtSupport::QtKitAspect::qtVersion(target->kit())); auto qt = static_cast<AndroidQtVersion *>(QtSupport::QtKitAspect::qtVersion(target->kit()));
return qt->androidAbis(); return qt ? qt->androidAbis() : QStringList();
} }
QString AndroidManager::archTriplet(const QString &abi) QString AndroidManager::archTriplet(const QString &abi)

2
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -164,7 +164,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Utils::Id id)
initialArgs.append(QString::fromLatin1("-DANDROID_ABI:STRING=%1").arg(preferredAbi)); initialArgs.append(QString::fromLatin1("-DANDROID_ABI:STRING=%1").arg(preferredAbi));
QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(k); 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>(); auto sdkLocation = bs->data(Android::Constants::SdkLocation).value<FilePath>();
initialArgs.append( initialArgs.append(
QString::fromLatin1("-DANDROID_SDK:PATH=%1").arg(sdkLocation.toString())); QString::fromLatin1("-DANDROID_SDK:PATH=%1").arg(sdkLocation.toString()));