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

Android: Drop special AndroidPackageInstallationStepWidget

Browse Source 
A base BuildStepConfigWidget with a summary updater are good enough
nowadays.

Change-Id: Ic8df7662cc28969786fd93171c53ec428a09db58
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
hjk
2020-07-28 17:28:51 +02:00
parent 0c26c3602d
commit c467ae6114
1 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/android/androidpackageinstallationstep.cpp
View File

@@ -62,35 +62,19 @@ class AndroidPackageInstallationStep final : public AbstractProcessStep
Q_DECLARE_TR_FUNCTIONS(Android::AndroidPackageInstallationStep)
public:
AndroidPackageInstallationStep(BuildStepList *bsl, Utils::Id id);
BuildStepConfigWidget *createConfigWidget() final;
AndroidPackageInstallationStep(BuildStepList *bsl, Id id);
QString nativeAndroidBuildPath() const;
private:
bool init() final;
void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
void setupOutputFormatter(OutputFormatter *formatter) final;
void doRun() final;
QStringList m_androidDirsToClean;
};
class AndroidPackageInstallationStepWidget final : public BuildStepConfigWidget
{
Q_DECLARE_TR_FUNCTIONS(Android::AndroidPackageInstallationStepWidget)
public:
AndroidPackageInstallationStepWidget(BuildStep *step)
: BuildStepConfigWidget(step)
{
const QString cmd = static_cast<AndroidPackageInstallationStep *>(step)
->nativeAndroidBuildPath();
setSummaryText(tr("<b>Make install:</b> Copy App Files to %1").arg(cmd));
}
};
AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Utils::Id id)
AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Id id)
: AbstractProcessStep(bsl, id)
{
const QString name = tr("Copy application data");
@@ -98,6 +82,9 @@ AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bs
setDisplayName(name);
setWidgetExpandedByDefault(false);
setImmutable(true);
setSummaryUpdater([this] {
return tr("<b>Make install:</b> Copy App Files to %1").arg(nativeAndroidBuildPath());
});
}
bool AndroidPackageInstallationStep::init()
@@ -183,11 +170,6 @@ void AndroidPackageInstallationStep::doRun()
}
}
BuildStepConfigWidget *AndroidPackageInstallationStep::createConfigWidget()
{
return new AndroidPackageInstallationStepWidget(this);
}
//
// AndroidPackageInstallationStepFactory
//