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

16
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -85,7 +85,6 @@ const QVersionNumber gradleScriptRevokedSdkVersion(25, 3, 0);
const char KeystoreLocationKey[] = "KeystoreLocation";
const char BuildTargetSdkKey[] = "BuildTargetSdk";
const char VerboseOutputKey[] = "VerboseOutput";
const char UseMinistroKey[] = "UseMinistro";
static void setupProcessParameters(ProcessParameters *pp,
BuildStep *step,
@@ -234,9 +233,6 @@ bool AndroidBuildApkStep::init()
if (m_buildAAB)
arguments << "--aab" << "--jarsigner";
if (m_useMinistro)
arguments << "--deployment" << "ministro";
QStringList argumentsPasswordConcealed = arguments;
if (m_signPackage) {
@@ -489,7 +485,6 @@ bool AndroidBuildApkStep::fromMap(const QVariantMap &map)
sdkManager()->latestAndroidSdkPlatform());
}
m_verbose = map.value(VerboseOutputKey).toBool();
m_useMinistro = map.value(UseMinistroKey).toBool();
return ProjectExplorer::BuildStep::fromMap(map);
}
@@ -499,7 +494,6 @@ QVariantMap AndroidBuildApkStep::toMap() const
map.insert(KeystoreLocationKey, m_keystorePath.toString());
map.insert(BuildTargetSdkKey, m_buildTargetSdk);
map.insert(VerboseOutputKey, m_verbose);
map.insert(UseMinistroKey, m_useMinistro);
return map;
}
@@ -596,16 +590,6 @@ void AndroidBuildApkStep::setVerboseOutput(bool verbose)
m_verbose = verbose;
}
bool AndroidBuildApkStep::useMinistro() const
{
return m_useMinistro;
}
void AndroidBuildApkStep::setUseMinistro(bool useMinistro)
{
m_useMinistro = useMinistro;
}
bool AndroidBuildApkStep::addDebugger() const
{
return m_addDebugger;