forked from qt-creator/qt-creator
257c04b664
Make it possible to create multiple AndroidConfigs so that we can have a different one in the settings dialog from the global one. Move pretty much every method from AndroidConfigurations to AndroidConfig, so that the settings dialog can work with its copy. Also add some additional logic to the settings page around the java setting. To start the avd manager we need both a sdk path and a java path. Also do some basic additional checking of the java path. Task-number: QTCREATORBUG-7724 Task-number: QTCREATORBUG-10936 Task-number: QTCREATORBUG-10937 Task-number: QTCREATORBUG-11059 Task-number: QTCREATORBUG-11218 Change-Id: I148c69b9c98a8a070d17d9b0e223d01db1750e69 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
137 lines
4.2 KiB
C++
137 lines
4.2 KiB
C++
/**************************************************************************
|
|
**
|
|
** Copyright (c) 2014 BogDan Vatra <bog_dan_ro@yahoo.com>
|
|
** 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 "androiddeploystepwidget.h"
|
|
#include "ui_androiddeploystepwidget.h"
|
|
|
|
#include "androiddeploystep.h"
|
|
#include "androidmanager.h"
|
|
#include "androidrunconfiguration.h"
|
|
|
|
#include <coreplugin/icore.h>
|
|
|
|
#include <QFileDialog>
|
|
|
|
namespace Android {
|
|
namespace Internal {
|
|
|
|
AndroidDeployStepWidget::AndroidDeployStepWidget(AndroidDeployStep *step) :
|
|
ProjectExplorer::BuildStepConfigWidget(),
|
|
ui(new Ui::AndroidDeployStepWidget),
|
|
m_step(step)
|
|
{
|
|
ui->setupUi(this);
|
|
|
|
deployOptionsChanged();
|
|
|
|
connect(ui->ministroOption, SIGNAL(clicked()), SLOT(setMinistro()));
|
|
connect(ui->temporaryQtOption, SIGNAL(clicked()), SLOT(setDeployLocalQtLibs()));
|
|
connect(ui->bundleQtOption, SIGNAL(clicked()), SLOT(setBundleQtLibs()));
|
|
|
|
connect(ui->chooseButton, SIGNAL(clicked()), SLOT(setQASIPackagePath()));
|
|
connect(ui->cleanLibsPushButton, SIGNAL(clicked()), SLOT(cleanLibsOnDevice()));
|
|
connect(ui->resetDefaultDevices, SIGNAL(clicked()), SLOT(resetDefaultDevices()));
|
|
|
|
connect(m_step, SIGNAL(deployOptionsChanged()),
|
|
this, SLOT(deployOptionsChanged()));
|
|
}
|
|
|
|
void AndroidDeployStepWidget::deployOptionsChanged()
|
|
{
|
|
switch (m_step->deployAction()) {
|
|
case AndroidDeployStep::NoDeploy:
|
|
ui->ministroOption->setChecked(true);
|
|
break;
|
|
case AndroidDeployStep::DeployLocal:
|
|
ui->temporaryQtOption->setChecked(true);
|
|
break;
|
|
case AndroidDeployStep::BundleLibraries:
|
|
ui->bundleQtOption->setChecked(true);
|
|
break;
|
|
default:
|
|
ui->ministroOption->setChecked(true);
|
|
break;
|
|
}
|
|
|
|
ui->bundleQtOption->setVisible(m_step->bundleQtOptionAvailable());
|
|
}
|
|
|
|
AndroidDeployStepWidget::~AndroidDeployStepWidget()
|
|
{
|
|
delete ui;
|
|
}
|
|
|
|
QString AndroidDeployStepWidget::displayName() const
|
|
{
|
|
return tr("<b>Deploy configurations</b>");
|
|
}
|
|
|
|
QString AndroidDeployStepWidget::summaryText() const
|
|
{
|
|
return displayName();
|
|
}
|
|
|
|
void AndroidDeployStepWidget::setMinistro()
|
|
{
|
|
m_step->setDeployAction(AndroidDeployStep::NoDeploy);
|
|
}
|
|
|
|
void AndroidDeployStepWidget::setDeployLocalQtLibs()
|
|
{
|
|
m_step->setDeployAction(AndroidDeployStep::DeployLocal);
|
|
}
|
|
|
|
void AndroidDeployStepWidget::setBundleQtLibs()
|
|
{
|
|
m_step->setDeployAction(AndroidDeployStep::BundleLibraries);
|
|
}
|
|
|
|
void AndroidDeployStepWidget::setQASIPackagePath()
|
|
{
|
|
QString packagePath =
|
|
QFileDialog::getOpenFileName(this, tr("Qt Android Smart Installer"),
|
|
QDir::homePath(), tr("Android package (*.apk)"));
|
|
if (!packagePath.isEmpty())
|
|
AndroidManager::installQASIPackage(m_step->target(), packagePath);
|
|
}
|
|
|
|
|
|
void AndroidDeployStepWidget::cleanLibsOnDevice()
|
|
{
|
|
AndroidManager::cleanLibsOnDevice(m_step->target());
|
|
}
|
|
|
|
void AndroidDeployStepWidget::resetDefaultDevices()
|
|
{
|
|
AndroidConfigurations::clearDefaultDevices(m_step->project());
|
|
}
|
|
|
|
} // namespace Internal
|
|
} // namespace Android
|