From 0a43f097de0629d6c751492588fb42d3f273cab6 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 9 Oct 2013 16:24:25 +0200 Subject: [PATCH] Android: Handle cases where the project is unparsed. Change-Id: If1757fff8ff458610dae8cbfcf561154c7d56753 Reviewed-by: Daniel Teske --- src/plugins/android/androiddeployqtstep.cpp | 4 ++++ src/plugins/android/androidmanager.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index ea5d6eeac00..96d4ecb3d29 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -167,6 +167,10 @@ bool AndroidDeployQtStep::init() emit addOutput(tr("Found old android folder in source directory. Qt 5.2 does not use that folder by default."), ErrorOutput); m_targetArch = AndroidManager::targetArch(target()); + if (m_targetArch.isEmpty()) { + emit addOutput(tr("No Android arch set by the .pro file."), ErrorOutput); + return false; + } m_deviceAPILevel = AndroidManager::minimumSDK(target()); AndroidDeviceInfo info = AndroidConfigurations::instance().showDeviceDialog(project(), m_deviceAPILevel, m_targetArch); if (info.serialNumber.isEmpty()) // aborted diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index e87e972e840..92e604db051 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -1195,6 +1195,8 @@ QString AndroidManager::libraryPrefix() void AndroidManager::cleanLibsOnDevice(ProjectExplorer::Target *target) { const QString targetArch = AndroidManager::targetArch(target); + if (targetArch.isEmpty()) + return; int deviceAPILevel = AndroidManager::minimumSDK(target); AndroidDeviceInfo info = AndroidConfigurations::instance().showDeviceDialog(target->project(), deviceAPILevel, targetArch); if (info.serialNumber.isEmpty()) // aborted @@ -1223,6 +1225,8 @@ void AndroidManager::cleanLibsOnDevice(ProjectExplorer::Target *target) void AndroidManager::installQASIPackage(ProjectExplorer::Target *target, const QString &packagePath) { const QString targetArch = AndroidManager::targetArch(target); + if (targetArch.isEmpty()) + return; int deviceAPILevel = AndroidManager::minimumSDK(target); AndroidDeviceInfo info = AndroidConfigurations::instance().showDeviceDialog(target->project(), deviceAPILevel, targetArch); if (info.serialNumber.isEmpty()) // aborted