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

Android: Handle cases where the project is unparsed.

Browse Source 
Change-Id: If1757fff8ff458610dae8cbfcf561154c7d56753
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2013-10-09 16:24:25 +02:00
parent e078321480
commit 0a43f097de
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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); 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()); 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()); m_deviceAPILevel = AndroidManager::minimumSDK(target());
AndroidDeviceInfo info = AndroidConfigurations::instance().showDeviceDialog(project(), m_deviceAPILevel, m_targetArch); AndroidDeviceInfo info = AndroidConfigurations::instance().showDeviceDialog(project(), m_deviceAPILevel, m_targetArch);
if (info.serialNumber.isEmpty()) // aborted if (info.serialNumber.isEmpty()) // aborted

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

@@ -1195,6 +1195,8 @@ QString AndroidManager::libraryPrefix()
void AndroidManager::cleanLibsOnDevice(ProjectExplorer::Target *target) void AndroidManager::cleanLibsOnDevice(ProjectExplorer::Target *target)
{ {
const QString targetArch = AndroidManager::targetArch(target); const QString targetArch = AndroidManager::targetArch(target);
if (targetArch.isEmpty())
return;
int deviceAPILevel = AndroidManager::minimumSDK(target); int deviceAPILevel = AndroidManager::minimumSDK(target);
AndroidDeviceInfo info = AndroidConfigurations::instance().showDeviceDialog(target->project(), deviceAPILevel, targetArch); AndroidDeviceInfo info = AndroidConfigurations::instance().showDeviceDialog(target->project(), deviceAPILevel, targetArch);
if (info.serialNumber.isEmpty()) // aborted if (info.serialNumber.isEmpty()) // aborted
@@ -1223,6 +1225,8 @@ void AndroidManager::cleanLibsOnDevice(ProjectExplorer::Target *target)
void AndroidManager::installQASIPackage(ProjectExplorer::Target *target, const QString &packagePath) void AndroidManager::installQASIPackage(ProjectExplorer::Target *target, const QString &packagePath)
{ {
const QString targetArch = AndroidManager::targetArch(target); const QString targetArch = AndroidManager::targetArch(target);
if (targetArch.isEmpty())
return;
int deviceAPILevel = AndroidManager::minimumSDK(target); int deviceAPILevel = AndroidManager::minimumSDK(target);
AndroidDeviceInfo info = AndroidConfigurations::instance().showDeviceDialog(target->project(), deviceAPILevel, targetArch); AndroidDeviceInfo info = AndroidConfigurations::instance().showDeviceDialog(target->project(), deviceAPILevel, targetArch);
if (info.serialNumber.isEmpty()) // aborted if (info.serialNumber.isEmpty()) // aborted