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

Android: Log Qt live apk path and few more code paths

Browse Source 
Change-Id: Id743db4865b399c619c04fc393540758352c60e1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Vikas Pachdha
2018-07-17 13:58:50 +02:00
parent 6fa2901173
commit b8da47af9c
5 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,6 +123,8 @@ bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
return false;
}
emit addOutput(tr("initializing deployment to Android device/simulator"), OutputFormat::Stdout);
RunConfiguration *rc = target()->activeRunConfiguration();
QTC_ASSERT(rc, return false);
const bool deployQtLive = rc->id().name().startsWith(qmlProjectRunConfigIdName);
@@ -135,10 +137,12 @@ bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
return false;
}
int deviceAPILevel = AndroidManager::minimumSDK(target());
int minTargetApi = AndroidManager::minimumSDK(target());
qCDebug(deployStepLog) << "Target architecture:" << m_targetArch
<< "Min target API" << minTargetApi;
AndroidDeviceInfo info = earlierDeviceInfo(earlierSteps, Id);
if (!info.isValid()) {
info = AndroidConfigurations::showDeviceDialog(project(), deviceAPILevel, m_targetArch);
info = AndroidConfigurations::showDeviceDialog(project(), minTargetApi, m_targetArch);
m_deviceInfo = info; // Keep around for later steps
}
@@ -147,7 +151,7 @@ bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
m_avdName = info.avdname;
m_serialNumber = info.serialNumber;
qCDebug(deployStepLog) << "AVD:" << m_avdName << "Device Serial:" << m_serialNumber;
qCDebug(deployStepLog) << "Selected Device:" << info;
if (!deployQtLive)
gatherFilesToPull();
@@ -155,6 +159,8 @@ bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
AndroidManager::setDeviceSerialNumber(target(), m_serialNumber);
AndroidManager::setDeviceApiLevel(target(), info.sdk);
emit addOutput(tr("Deploying to %1").arg(m_serialNumber), OutputFormat::Stdout);
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit());
if (!version)
return false;