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

Android: Fix crash when Kit has no Qt

Browse Source 
Change-Id: I419bbb68d1d39fa88ca02fb644218ea78216c1ad
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Christian Kandeler
2020-01-17 13:00:13 +01:00
parent f1b2120ccb
commit 07544d4e07
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -143,7 +143,8 @@ AndroidDeployQtStep::AndroidDeployQtStep(ProjectExplorer::BuildStepList *parent)
: ProjectExplorer::BuildStep(parent, stepId()) : ProjectExplorer::BuildStep(parent, stepId())
{ {
setImmutable(true); setImmutable(true);
m_uninstallPreviousPackage = QtSupport::QtKitAspect::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0); const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitAspect::qtVersion(target()->kit());
m_uninstallPreviousPackage = qt && qt->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0);
//: AndroidDeployQtStep default display name //: AndroidDeployQtStep default display name
setDefaultDisplayName(tr("Deploy to Android device")); setDefaultDisplayName(tr("Deploy to Android device"));
@@ -163,6 +164,10 @@ Core::Id AndroidDeployQtStep::stepId()
bool AndroidDeployQtStep::init() bool AndroidDeployQtStep::init()
{ {
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target()->kit());
if (!version) // TODO: Add error message
return false;
m_androiddeployqtArgs = CommandLine(); m_androiddeployqtArgs = CommandLine();
m_androidABIs = AndroidManager::applicationAbis(target()); m_androidABIs = AndroidManager::applicationAbis(target());
@@ -214,10 +219,6 @@ bool AndroidDeployQtStep::init()
emit addOutput(tr("Deploying to %1").arg(m_serialNumber), OutputFormat::Stdout); emit addOutput(tr("Deploying to %1").arg(m_serialNumber), OutputFormat::Stdout);
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target()->kit());
if (!version)
return false;
m_uninstallPreviousPackageRun = m_uninstallPreviousPackage; m_uninstallPreviousPackageRun = m_uninstallPreviousPackage;
if (m_uninstallPreviousPackageRun) if (m_uninstallPreviousPackageRun)
m_manifestName = AndroidManager::manifestPath(target()); m_manifestName = AndroidManager::manifestPath(target());
@@ -615,7 +616,8 @@ void AndroidDeployQtStep::setUninstallPreviousPackage(bool uninstall)
AndroidDeployQtStep::UninstallType AndroidDeployQtStep::uninstallPreviousPackage() AndroidDeployQtStep::UninstallType AndroidDeployQtStep::uninstallPreviousPackage()
{ {
if (QtSupport::QtKitAspect::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitAspect::qtVersion(target()->kit());
if (qt && qt->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0))
return ForceUnintall; return ForceUnintall;
return m_uninstallPreviousPackage ? Uninstall : Keep; return m_uninstallPreviousPackage ? Uninstall : Keep;
} }