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

Android: remove ministro deployment option

Browse Source 
Task-number: QTCREATORBUG-23761
Change-Id: I5be3c78a009f1747a3ccf7a6bd342969d2b8ece4
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-06-12 14:22:18 +03:00
parent 1bc3e2f0ba
commit 2acca95fab
4 changed files with 9 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,15 +108,15 @@ public:
auto resetDefaultDevices = new QPushButton(this);
resetDefaultDevices->setText(AndroidDeployQtStep::tr("Reset Default Devices"));
auto installMinistroButton = new QPushButton(this);
installMinistroButton->setText(AndroidDeployQtStep::tr("Install Ministro from APK"));
auto installCustomApkButton = new QPushButton(this);
installCustomApkButton->setText(AndroidDeployQtStep::tr("Install an APK File"));
connect(installMinistroButton, &QAbstractButton::clicked, this, [this, step] {
QString packagePath =
QFileDialog::getOpenFileName(this,
AndroidDeployQtStep::tr("Qt Android Smart Installer"),
QDir::homePath(),
AndroidDeployQtStep::tr("Android package (*.apk)"));
connect(installCustomApkButton, &QAbstractButton::clicked, this, [this, step] {
const QString packagePath
= QFileDialog::getOpenFileName(this,
AndroidDeployQtStep::tr("Qt Android Installer"),
QDir::homePath(),
AndroidDeployQtStep::tr("Android package (*.apk)"));
if (!packagePath.isEmpty())
AndroidManager::installQASIPackage(step->target(), packagePath);
});
@@ -131,7 +131,7 @@ public:
auto layout = new QVBoxLayout(this);
layout->addWidget(uninstallPreviousPackage);
layout->addWidget(resetDefaultDevices);
layout->addWidget(installMinistroButton);
layout->addWidget(installCustomApkButton);
}
};
@@ -252,11 +252,6 @@ bool AndroidDeployQtStep::init()
"--no-build",
"--input", jsonFile});
if (androidBuildApkStep && androidBuildApkStep->useMinistro()) {
qCDebug(deployStepLog) << "Using ministro";
m_androiddeployqtArgs.addArgs({"--deployment", "ministro"});
}
m_androiddeployqtArgs.addArg("--gradle");
if (androidBuildApkStep && androidBuildApkStep->signPackage()) {