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

Android: Use a aspect for AndroidBuildStep::buildAAB

Browse Source 
Testing the water...

Change-Id: Ic5bd970519f0ec11e03ba19a24e0aeb2a84a18e3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-08-17 14:42:06 +02:00
parent 45bae4b525
commit a7630f999f
2 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,17 +302,12 @@ QWidget *AndroidBuildApkWidget::createAdvancedGroup()
auto verboseOutputCheckBox = new QCheckBox(Tr::tr("Verbose output"), group); auto verboseOutputCheckBox = new QCheckBox(Tr::tr("Verbose output"), group);
verboseOutputCheckBox->setChecked(m_step->verboseOutput()); verboseOutputCheckBox->setChecked(m_step->verboseOutput());
auto vbox = new QVBoxLayout(group); Layouting::Column {
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(m_step->kit()); m_step->buildAAB,
if (version && version->qtVersion() >= QVersionNumber(5, 14)) { openPackageLocationCheckBox,
auto buildAAB = new QCheckBox(Tr::tr("Build Android App Bundle (*.aab)"), group); verboseOutputCheckBox,
buildAAB->setChecked(m_step->buildAAB()); m_addDebuggerCheckBox
connect(buildAAB, &QAbstractButton::toggled, m_step, &AndroidBuildApkStep::setBuildAAB); }.attachTo(group);
vbox->addWidget(buildAAB);
}
vbox->addWidget(openPackageLocationCheckBox);
vbox->addWidget(verboseOutputCheckBox);
vbox->addWidget(m_addDebuggerCheckBox);
connect(verboseOutputCheckBox, &QAbstractButton::toggled, connect(verboseOutputCheckBox, &QAbstractButton::toggled,
this, [this](bool checked) { m_step->setVerboseOutput(checked); }); this, [this](bool checked) { m_step->setVerboseOutput(checked); });
@@ -479,6 +474,11 @@ AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent, Utils::Id id)
setImmutable(true); setImmutable(true);
setDisplayName(Tr::tr("Build Android APK")); setDisplayName(Tr::tr("Build Android APK"));
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit());
buildAAB.setLabelText(Tr::tr("Build Android App Bundle (*.aab)"));
buildAAB.setVisible(version && version->qtVersion() >= QVersionNumber(5, 14));
connect(this, &BuildStep::addOutput, this, [this](const QString &string, OutputFormat format) { connect(this, &BuildStep::addOutput, this, [this](const QString &string, OutputFormat format) {
if (format == OutputFormat::Stderr) if (format == OutputFormat::Stderr)
stdError(string); stdError(string);
@@ -566,7 +566,7 @@ bool AndroidBuildApkStep::init()
arguments << "--gradle"; arguments << "--gradle";
if (m_buildAAB) if (buildAAB())
arguments << "--aab" << "--jarsigner"; arguments << "--aab" << "--jarsigner";
if (buildType() == BuildConfiguration::Release) { if (buildType() == BuildConfiguration::Release) {
@@ -997,16 +997,6 @@ void AndroidBuildApkStep::setSignPackage(bool b)
m_signPackage = b; m_signPackage = b;
} }
bool AndroidBuildApkStep::buildAAB() const
{
return m_buildAAB;
}
void AndroidBuildApkStep::setBuildAAB(bool aab)
{
m_buildAAB = aab;
}
bool AndroidBuildApkStep::openPackageLocation() const bool AndroidBuildApkStep::openPackageLocation() const
{ {
return m_openPackageLocation; return m_openPackageLocation;

4
src/plugins/android/androidbuildapkstep.h
View File

@@ -37,8 +37,7 @@ public:
bool signPackage() const; bool signPackage() const;
void setSignPackage(bool b); void setSignPackage(bool b);
bool buildAAB() const; Utils::BoolAspect buildAAB{this};
void setBuildAAB(bool aab);
bool openPackageLocation() const; bool openPackageLocation() const;
void setOpenPackageLocation(bool open); void setOpenPackageLocation(bool open);
@@ -72,7 +71,6 @@ private:
void reportWarningOrError(const QString &message, ProjectExplorer::Task::TaskType type); void reportWarningOrError(const QString &message, ProjectExplorer::Task::TaskType type);
void updateBuildToolsVersionInJsonFile(); void updateBuildToolsVersionInJsonFile();
bool m_buildAAB = false;
bool m_signPackage = false; bool m_signPackage = false;
bool m_verbose = false; bool m_verbose = false;
bool m_openPackageLocation = false; bool m_openPackageLocation = false;