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

Android: Fix deploy regeression

Browse Source 
Task-number: QTCREATORBUG-10777
Change-Id: Ie02ecbd95c38a50512b943e5f688bf4187a1eda5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2013-11-14 13:20:03 +01:00
parent d8c51d9a2a
commit 9705ed8a1b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -299,6 +299,7 @@ void AndroidDeployQtStep::run(QFutureInterface<bool> &fi)
QString serialNumber = AndroidConfigurations::instance().waitForAvd(m_deviceAPILevel, m_targetArch); QString serialNumber = AndroidConfigurations::instance().waitForAvd(m_deviceAPILevel, m_targetArch);
if (serialNumber.isEmpty()) { if (serialNumber.isEmpty()) {
fi.reportResult(false); fi.reportResult(false);
emit finished();
return; return;
} }
m_serialNumber = serialNumber; m_serialNumber = serialNumber;
@@ -495,7 +496,7 @@ void AndroidDeployQtStep::setInputFile(const QString &file)
bool AndroidDeployQtStep::runInGuiThread() const bool AndroidDeployQtStep::runInGuiThread() const
{ {
return false; return true;
} }
bool AndroidDeployQtStep::verboseOutput() const bool AndroidDeployQtStep::verboseOutput() const