2013-09-17 18:24:57 +02:00
|
|
|
/**************************************************************************
|
|
|
|
|
**
|
2014-01-07 13:27:11 +01:00
|
|
|
** Copyright (c) 2014 BogDan Vatra <bog_dan_ro@yahoo.com>
|
|
|
|
|
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
2013-09-17 18:24:57 +02:00
|
|
|
** Contact: http://www.qt-project.org/legal
|
|
|
|
|
**
|
|
|
|
|
** This file is part of Qt Creator.
|
|
|
|
|
**
|
|
|
|
|
** Commercial License Usage
|
|
|
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
|
|
** accordance with the commercial license agreement provided with the
|
|
|
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
|
|
|
** a written agreement between you and Digia. For licensing terms and
|
|
|
|
|
** conditions see http://qt.digia.com/licensing. For further information
|
|
|
|
|
** use the contact form at http://qt.digia.com/contact-us.
|
|
|
|
|
**
|
|
|
|
|
** GNU Lesser General Public License Usage
|
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
|
|
** General Public License version 2.1 as published by the Free Software
|
|
|
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
|
|
|
** packaging of this file. Please review the following information to
|
|
|
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
|
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
|
|
|
**
|
|
|
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
|
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
|
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
|
|
|
**
|
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
|
|
#include "androiddeployqtstep.h"
|
|
|
|
|
#include "androiddeployqtwidget.h"
|
2014-06-25 15:42:11 +02:00
|
|
|
#include "androidqtsupport.h"
|
2013-09-17 18:24:57 +02:00
|
|
|
#include "certificatesmodel.h"
|
|
|
|
|
|
|
|
|
|
#include "javaparser.h"
|
|
|
|
|
#include "androidmanager.h"
|
2013-11-06 13:06:10 +01:00
|
|
|
#include "androidconstants.h"
|
2013-09-17 18:24:57 +02:00
|
|
|
|
|
|
|
|
#include <coreplugin/fileutils.h>
|
|
|
|
|
#include <coreplugin/icore.h>
|
|
|
|
|
#include <coreplugin/messagemanager.h>
|
2014-06-25 15:42:11 +02:00
|
|
|
|
|
|
|
|
#include <projectexplorer/buildconfiguration.h>
|
2013-09-17 18:24:57 +02:00
|
|
|
#include <projectexplorer/buildsteplist.h>
|
|
|
|
|
#include <projectexplorer/projectexplorerconstants.h>
|
|
|
|
|
#include <projectexplorer/project.h>
|
2014-06-25 15:42:11 +02:00
|
|
|
#include <projectexplorer/target.h>
|
|
|
|
|
|
2013-09-17 18:24:57 +02:00
|
|
|
#include <qtsupport/qtkitinformation.h>
|
2014-06-25 15:42:11 +02:00
|
|
|
|
|
|
|
|
#include <utils/qtcassert.h>
|
|
|
|
|
#include <utils/qtcprocess.h>
|
|
|
|
|
|
2013-09-17 18:24:57 +02:00
|
|
|
#include <QInputDialog>
|
|
|
|
|
#include <QMessageBox>
|
|
|
|
|
|
2014-06-25 15:42:11 +02:00
|
|
|
|
2013-09-17 18:24:57 +02:00
|
|
|
using namespace Android;
|
|
|
|
|
using namespace Android::Internal;
|
|
|
|
|
|
2014-06-25 15:42:11 +02:00
|
|
|
const QLatin1String UninstallPreviousPackageKey("UninstallPreviousPackage");
|
2013-09-17 18:24:57 +02:00
|
|
|
const QLatin1String KeystoreLocationKey("KeystoreLocation");
|
|
|
|
|
const QLatin1String SignPackageKey("SignPackage");
|
|
|
|
|
const QLatin1String BuildTargetSdkKey("BuildTargetSdk");
|
|
|
|
|
const QLatin1String VerboseOutputKey("VerboseOutput");
|
|
|
|
|
const QLatin1String InputFile("InputFile");
|
2014-01-08 09:33:21 +01:00
|
|
|
const QLatin1String ProFilePathForInputFile("ProFilePathForInputFile");
|
2014-06-25 15:42:11 +02:00
|
|
|
const QLatin1String InstallFailedInconsistentCertificatesString("INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES");
|
2013-09-17 18:24:57 +02:00
|
|
|
const Core::Id AndroidDeployQtStep::Id("Qt4ProjectManager.AndroidDeployQtStep");
|
|
|
|
|
|
|
|
|
|
//////////////////
|
|
|
|
|
// AndroidDeployQtStepFactory
|
|
|
|
|
/////////////////
|
|
|
|
|
|
|
|
|
|
AndroidDeployQtStepFactory::AndroidDeployQtStepFactory(QObject *parent)
|
|
|
|
|
: IBuildStepFactory(parent)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QList<Core::Id> AndroidDeployQtStepFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
|
|
|
|
|
{
|
|
|
|
|
if (parent->id() != ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
|
|
|
|
|
return QList<Core::Id>();
|
|
|
|
|
if (!AndroidManager::supportsAndroid(parent->target()))
|
|
|
|
|
return QList<Core::Id>();
|
|
|
|
|
if (parent->contains(AndroidDeployQtStep::Id))
|
|
|
|
|
return QList<Core::Id>();
|
|
|
|
|
return QList<Core::Id>() << AndroidDeployQtStep::Id;
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-01 11:08:26 +02:00
|
|
|
QString AndroidDeployQtStepFactory::displayNameForId(Core::Id id) const
|
2013-09-17 18:24:57 +02:00
|
|
|
{
|
|
|
|
|
if (id == AndroidDeployQtStep::Id)
|
|
|
|
|
return tr("Deploy to Android device or emulator");
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-01 11:08:26 +02:00
|
|
|
bool AndroidDeployQtStepFactory::canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const
|
2013-09-17 18:24:57 +02:00
|
|
|
{
|
|
|
|
|
return availableCreationIds(parent).contains(id);
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-01 11:08:26 +02:00
|
|
|
ProjectExplorer::BuildStep *AndroidDeployQtStepFactory::create(ProjectExplorer::BuildStepList *parent, Core::Id id)
|
2013-09-17 18:24:57 +02:00
|
|
|
{
|
|
|
|
|
Q_ASSERT(canCreate(parent, id));
|
|
|
|
|
Q_UNUSED(id);
|
|
|
|
|
return new AndroidDeployQtStep(parent);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool AndroidDeployQtStepFactory::canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const
|
|
|
|
|
{
|
|
|
|
|
return canCreate(parent, ProjectExplorer::idFromMap(map));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ProjectExplorer::BuildStep *AndroidDeployQtStepFactory::restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map)
|
|
|
|
|
{
|
|
|
|
|
Q_ASSERT(canRestore(parent, map));
|
|
|
|
|
AndroidDeployQtStep * const step = new AndroidDeployQtStep(parent);
|
|
|
|
|
if (!step->fromMap(map)) {
|
|
|
|
|
delete step;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return step;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool AndroidDeployQtStepFactory::canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product) const
|
|
|
|
|
{
|
|
|
|
|
return canCreate(parent, product->id());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ProjectExplorer::BuildStep *AndroidDeployQtStepFactory::clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product)
|
|
|
|
|
{
|
|
|
|
|
Q_ASSERT(canClone(parent, product));
|
|
|
|
|
return new AndroidDeployQtStep(parent, static_cast<AndroidDeployQtStep *>(product));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//////////////////
|
|
|
|
|
// AndroidDeployQtStep
|
|
|
|
|
/////////////////
|
|
|
|
|
|
|
|
|
|
AndroidDeployQtStep::AndroidDeployQtStep(ProjectExplorer::BuildStepList *parent)
|
|
|
|
|
: ProjectExplorer::AbstractProcessStep(parent, Id)
|
|
|
|
|
{
|
|
|
|
|
ctor();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AndroidDeployQtStep::AndroidDeployQtStep(ProjectExplorer::BuildStepList *parent,
|
|
|
|
|
AndroidDeployQtStep *other)
|
|
|
|
|
: ProjectExplorer::AbstractProcessStep(parent, other)
|
|
|
|
|
{
|
|
|
|
|
ctor();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void AndroidDeployQtStep::ctor()
|
|
|
|
|
{
|
2014-06-25 15:42:11 +02:00
|
|
|
m_uninstallPreviousPackage = false;
|
|
|
|
|
m_uninstallPreviousPackageTemp = false;
|
|
|
|
|
m_uninstallPreviousPackageRun = false;
|
|
|
|
|
|
2013-09-17 18:24:57 +02:00
|
|
|
//: AndroidDeployQtStep default display name
|
|
|
|
|
setDefaultDisplayName(tr("Deploy to Android device"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool AndroidDeployQtStep::init()
|
|
|
|
|
{
|
2014-06-24 16:47:10 +02:00
|
|
|
if (AndroidManager::checkForQt51Files(project()->projectDirectory()))
|
2013-10-18 10:48:11 +02:00
|
|
|
emit addOutput(tr("Found old folder \"android\" in source directory. Qt 5.2 does not use that folder by default."), ErrorOutput);
|
2013-09-17 18:24:57 +02:00
|
|
|
|
|
|
|
|
m_targetArch = AndroidManager::targetArch(target());
|
2013-10-09 16:24:25 +02:00
|
|
|
if (m_targetArch.isEmpty()) {
|
|
|
|
|
emit addOutput(tr("No Android arch set by the .pro file."), ErrorOutput);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2013-09-17 18:24:57 +02:00
|
|
|
m_deviceAPILevel = AndroidManager::minimumSDK(target());
|
2013-12-16 20:19:07 +01:00
|
|
|
AndroidDeviceInfo info = AndroidConfigurations::showDeviceDialog(project(), m_deviceAPILevel, m_targetArch);
|
2013-09-17 18:24:57 +02:00
|
|
|
if (info.serialNumber.isEmpty()) // aborted
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
if (info.type == AndroidDeviceInfo::Emulator) {
|
|
|
|
|
m_avdName = info.serialNumber;
|
|
|
|
|
m_serialNumber.clear();
|
|
|
|
|
m_deviceAPILevel = info.sdk;
|
|
|
|
|
} else {
|
|
|
|
|
m_avdName.clear();
|
|
|
|
|
m_serialNumber = info.serialNumber;
|
|
|
|
|
}
|
2014-06-25 15:42:11 +02:00
|
|
|
AndroidManager::setDeviceSerialNumber(target(), m_serialNumber);
|
2013-09-17 18:24:57 +02:00
|
|
|
|
2014-06-25 15:42:11 +02:00
|
|
|
ProjectExplorer::BuildConfiguration *bc = target()->activeBuildConfiguration();
|
2013-09-17 18:24:57 +02:00
|
|
|
|
|
|
|
|
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit());
|
|
|
|
|
if (!version)
|
|
|
|
|
return false;
|
|
|
|
|
|
2014-06-25 15:42:11 +02:00
|
|
|
m_uninstallPreviousPackageRun = m_uninstallPreviousPackage || m_uninstallPreviousPackageTemp;
|
|
|
|
|
m_uninstallPreviousPackageTemp = false;
|
|
|
|
|
if (m_uninstallPreviousPackageRun) {
|
|
|
|
|
m_packageName = AndroidManager::packageName(target());
|
|
|
|
|
if (m_packageName.isEmpty()){
|
|
|
|
|
emit addOutput(tr("Cannot find the package name."), ErrorOutput);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2013-09-17 18:24:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ProjectExplorer::ProcessParameters *pp = processParameters();
|
2014-06-25 15:42:11 +02:00
|
|
|
pp->setCommand(AndroidConfigurations::currentConfig().adbToolPath().toString());
|
2013-09-17 18:24:57 +02:00
|
|
|
pp->setMacroExpander(bc->macroExpander());
|
|
|
|
|
pp->setWorkingDirectory(bc->buildDirectory().toString());
|
|
|
|
|
Utils::Environment env = bc->environment();
|
|
|
|
|
pp->setEnvironment(env);
|
2014-06-25 15:42:11 +02:00
|
|
|
m_apkPath = AndroidManager::androidQtSupport(target())->apkPath(target(), AndroidManager::signPackage(target())
|
|
|
|
|
? AndroidQtSupport::ReleaseBuildSigned
|
|
|
|
|
: AndroidQtSupport::DebugBuild).toString();
|
2013-09-17 18:24:57 +02:00
|
|
|
|
|
|
|
|
m_buildDirectory = bc->buildDirectory().toString();
|
|
|
|
|
|
|
|
|
|
bool result = AbstractProcessStep::init();
|
|
|
|
|
if (!result)
|
|
|
|
|
return false;
|
|
|
|
|
|
2013-12-16 20:19:07 +01:00
|
|
|
if (AndroidConfigurations::currentConfig().findAvd(m_deviceAPILevel, m_targetArch).isEmpty())
|
|
|
|
|
AndroidConfigurations::currentConfig().startAVDAsync(m_avdName);
|
2013-09-17 18:24:57 +02:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void AndroidDeployQtStep::run(QFutureInterface<bool> &fi)
|
|
|
|
|
{
|
2014-06-25 15:42:11 +02:00
|
|
|
m_installOk = true;
|
2013-09-17 18:24:57 +02:00
|
|
|
if (!m_avdName.isEmpty()) {
|
2013-12-16 20:19:07 +01:00
|
|
|
QString serialNumber = AndroidConfigurations::currentConfig().waitForAvd(m_deviceAPILevel, m_targetArch, fi);
|
2013-09-17 18:24:57 +02:00
|
|
|
if (serialNumber.isEmpty()) {
|
|
|
|
|
fi.reportResult(false);
|
2013-11-14 13:20:03 +01:00
|
|
|
emit finished();
|
2013-09-17 18:24:57 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
m_serialNumber = serialNumber;
|
2014-06-25 15:42:11 +02:00
|
|
|
AndroidManager::setDeviceSerialNumber(target(), serialNumber);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (m_uninstallPreviousPackageRun) {
|
|
|
|
|
emit addOutput(tr("Uninstall previous package %1.").arg(m_packageName), MessageOutput);
|
|
|
|
|
runCommand(AndroidConfigurations::currentConfig().adbToolPath().toString(),
|
|
|
|
|
AndroidDeviceInfo::adbSelector(m_serialNumber)
|
|
|
|
|
<< QLatin1String("uninstall") << m_packageName);
|
2013-09-17 18:24:57 +02:00
|
|
|
}
|
|
|
|
|
|
2014-06-25 15:42:11 +02:00
|
|
|
ProjectExplorer::ProcessParameters *pp = processParameters();
|
|
|
|
|
QString args;
|
2014-07-24 11:44:35 +02:00
|
|
|
foreach (const QString &arg, AndroidDeviceInfo::adbSelector(m_serialNumber))
|
2014-06-25 15:42:11 +02:00
|
|
|
Utils::QtcProcess::addArg(&args, arg);
|
|
|
|
|
|
|
|
|
|
Utils::QtcProcess::addArg(&args, QLatin1String("install"));
|
|
|
|
|
Utils::QtcProcess::addArg(&args, QLatin1String("-r"));
|
|
|
|
|
Utils::QtcProcess::addArg(&args, m_apkPath);
|
|
|
|
|
pp->setArguments(args);
|
|
|
|
|
pp->resolveAll();
|
|
|
|
|
|
2013-09-17 18:24:57 +02:00
|
|
|
AbstractProcessStep::run(fi);
|
|
|
|
|
|
|
|
|
|
emit addOutput(tr("Pulling files necessary for debugging."), MessageOutput);
|
2013-12-16 20:19:07 +01:00
|
|
|
runCommand(AndroidConfigurations::currentConfig().adbToolPath().toString(),
|
2013-09-17 18:24:57 +02:00
|
|
|
AndroidDeviceInfo::adbSelector(m_serialNumber)
|
|
|
|
|
<< QLatin1String("pull") << QLatin1String("/system/bin/app_process")
|
|
|
|
|
<< QString::fromLatin1("%1/app_process").arg(m_buildDirectory));
|
2013-12-16 20:19:07 +01:00
|
|
|
runCommand(AndroidConfigurations::currentConfig().adbToolPath().toString(),
|
2013-09-17 18:24:57 +02:00
|
|
|
AndroidDeviceInfo::adbSelector(m_serialNumber) << QLatin1String("pull")
|
|
|
|
|
<< QLatin1String("/system/lib/libc.so")
|
|
|
|
|
<< QString::fromLatin1("%1/libc.so").arg(m_buildDirectory));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void AndroidDeployQtStep::runCommand(const QString &program, const QStringList &arguments)
|
|
|
|
|
{
|
|
|
|
|
QProcess buildProc;
|
2014-06-25 15:42:11 +02:00
|
|
|
emit addOutput(tr("Package deploy: Running command \"%1 %2\".").arg(program).arg(arguments.join(QLatin1String(" "))), BuildStep::MessageOutput);
|
2013-09-17 18:24:57 +02:00
|
|
|
buildProc.start(program, arguments);
|
|
|
|
|
if (!buildProc.waitForStarted()) {
|
2014-06-25 15:42:11 +02:00
|
|
|
emit addOutput(tr("Packaging error: Could not start command \"%1 %2\". Reason: %3")
|
2013-09-17 18:24:57 +02:00
|
|
|
.arg(program).arg(arguments.join(QLatin1String(" "))).arg(buildProc.errorString()), BuildStep::ErrorMessageOutput);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (!buildProc.waitForFinished(2 * 60 * 1000)
|
|
|
|
|
|| buildProc.error() != QProcess::UnknownError
|
|
|
|
|
|| buildProc.exitCode() != 0) {
|
2014-06-25 15:42:11 +02:00
|
|
|
QString mainMessage = tr("Packaging Error: Command \"%1 %2\" failed.")
|
2013-09-17 18:24:57 +02:00
|
|
|
.arg(program).arg(arguments.join(QLatin1String(" ")));
|
|
|
|
|
if (buildProc.error() != QProcess::UnknownError)
|
2013-10-17 14:52:10 +02:00
|
|
|
mainMessage += QLatin1Char(' ') + tr("Reason: %1").arg(buildProc.errorString());
|
2013-09-17 18:24:57 +02:00
|
|
|
else
|
|
|
|
|
mainMessage += tr("Exit code: %1").arg(buildProc.exitCode());
|
|
|
|
|
emit addOutput(mainMessage, BuildStep::ErrorMessageOutput);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-25 15:42:11 +02:00
|
|
|
ProjectExplorer::BuildStepConfigWidget *AndroidDeployQtStep::createConfigWidget()
|
2013-09-17 18:24:57 +02:00
|
|
|
{
|
2014-06-25 15:42:11 +02:00
|
|
|
return new AndroidDeployQtWidget(this);
|
2013-09-17 18:24:57 +02:00
|
|
|
}
|
|
|
|
|
|
2014-06-25 15:42:11 +02:00
|
|
|
void AndroidDeployQtStep::stdOutput(const QString &line)
|
2013-09-17 18:24:57 +02:00
|
|
|
{
|
2014-06-25 15:42:11 +02:00
|
|
|
if (line.contains(InstallFailedInconsistentCertificatesString))
|
|
|
|
|
m_installOk = false;
|
|
|
|
|
AbstractProcessStep::stdOutput(line);
|
2013-09-17 18:24:57 +02:00
|
|
|
}
|
|
|
|
|
|
2014-06-25 15:42:11 +02:00
|
|
|
void AndroidDeployQtStep::stdError(const QString &line)
|
2013-09-17 18:24:57 +02:00
|
|
|
{
|
2014-06-25 15:42:11 +02:00
|
|
|
if (line.contains(InstallFailedInconsistentCertificatesString))
|
|
|
|
|
m_installOk = false;
|
|
|
|
|
AbstractProcessStep::stdError(line);
|
2013-09-17 18:24:57 +02:00
|
|
|
}
|
|
|
|
|
|
2014-06-25 15:42:11 +02:00
|
|
|
bool AndroidDeployQtStep::processSucceeded(int exitCode, QProcess::ExitStatus status)
|
2013-09-17 18:24:57 +02:00
|
|
|
{
|
2014-06-25 15:42:11 +02:00
|
|
|
if (!m_installOk && !m_uninstallPreviousPackageRun &&
|
|
|
|
|
QMessageBox::critical(0, tr("Install failed"),
|
|
|
|
|
tr("Another application with the same package id but signed with "
|
|
|
|
|
"different ceritificate already exists.\n"
|
2014-07-21 20:26:55 +03:00
|
|
|
"Do you want to uninstall the existing package next time?"),
|
2014-06-25 15:42:11 +02:00
|
|
|
QMessageBox::Yes, QMessageBox::No)
|
|
|
|
|
== QMessageBox::Yes) {
|
|
|
|
|
m_uninstallPreviousPackageTemp = true;
|
|
|
|
|
}
|
|
|
|
|
return m_installOk && AbstractProcessStep::processSucceeded(exitCode, status);
|
2013-09-17 18:24:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool AndroidDeployQtStep::fromMap(const QVariantMap &map)
|
|
|
|
|
{
|
2014-06-25 15:42:11 +02:00
|
|
|
m_uninstallPreviousPackage = map.value(UninstallPreviousPackageKey, false).toBool();
|
2013-09-17 18:24:57 +02:00
|
|
|
return ProjectExplorer::BuildStep::fromMap(map);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QVariantMap AndroidDeployQtStep::toMap() const
|
|
|
|
|
{
|
|
|
|
|
QVariantMap map = ProjectExplorer::BuildStep::toMap();
|
2014-06-25 15:42:11 +02:00
|
|
|
map.insert(UninstallPreviousPackageKey, m_uninstallPreviousPackage);
|
2013-09-17 18:24:57 +02:00
|
|
|
return map;
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-25 15:42:11 +02:00
|
|
|
void AndroidDeployQtStep::setUninstallPreviousPackage(bool uninstall)
|
2013-09-17 18:24:57 +02:00
|
|
|
{
|
2014-06-25 15:42:11 +02:00
|
|
|
m_uninstallPreviousPackage = uninstall;
|
2013-09-17 18:24:57 +02:00
|
|
|
}
|
|
|
|
|
|
2013-11-13 16:14:27 +01:00
|
|
|
bool AndroidDeployQtStep::runInGuiThread() const
|
|
|
|
|
{
|
2013-11-14 13:20:03 +01:00
|
|
|
return true;
|
2013-11-13 16:14:27 +01:00
|
|
|
}
|
|
|
|
|
|
2014-06-25 15:42:11 +02:00
|
|
|
bool AndroidDeployQtStep::uninstallPreviousPackage()
|
2013-09-17 18:24:57 +02:00
|
|
|
{
|
2014-06-25 15:42:11 +02:00
|
|
|
return m_uninstallPreviousPackage;
|
2013-09-17 18:24:57 +02:00
|
|
|
}
|