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

Merge remote-tracking branch 'origin/4.13'

Browse Source 
Change-Id: I015bac0cccdf466a923c706abdedd8bd8800b0cd
This commit is contained in:
Eike Ziller
2020-07-06 10:30:54 +02:00
parent a2bf75bb55 00bb6ea958
commit 1de74cceab
225 changed files with 4591 additions and 1394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,8 +163,12 @@ Utils::Id AndroidDeployQtStep::stepId()
bool AndroidDeployQtStep::init()
{
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target()->kit());
if (!version) // TODO: Add error message
if (!version) {
qCDebug(deployStepLog,
"The Qt version for kit %s is not valid.",
qPrintable(target()->kit()->displayName()));
return false;
}
m_androiddeployqtArgs = CommandLine();
@@ -205,7 +209,7 @@ bool AndroidDeployQtStep::init()
m_avdName = info.avdname;
m_serialNumber = info.serialNumber;
qCDebug(deployStepLog) << "Selected Device:" << info;
qCDebug(deployStepLog) << "Selected device info:" << info;
gatherFilesToPull();
@@ -242,7 +246,6 @@ bool AndroidDeployQtStep::init()
emit addOutput(tr("Cannot find the androiddeployqt tool."), OutputFormat::Stderr);
return false;
}
qCDebug(deployStepLog) << "Using androiddeployqt";
m_command = m_command.pathAppended(HostOsInfo::withExecutableSuffix("androiddeployqt"));
m_workingDirectory = bc->buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY);
@@ -493,9 +496,8 @@ void AndroidDeployQtStep::gatherFilesToPull()
m_filesToPull["/system/bin/" + linkerName] = buildDir + linkerName;
m_filesToPull["/system/" + libDirName + "/libc.so"] = buildDir + "libc.so";
qCDebug(deployStepLog) << "Files to pull from device:";
for (auto itr = m_filesToPull.constBegin(); itr != m_filesToPull.constEnd(); ++itr)
qCDebug(deployStepLog) << itr.key() << "to" << itr.value();
qCDebug(deployStepLog) << "Pulling file from device:" << itr.key() << "to:" << itr.value();
}
void AndroidDeployQtStep::doRun()