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

ProjectExplorer: Pass Id to BuildStep constructor

Browse Source 
Allows to use constants in fewer places, similar to what e.g.
RunConfiguration does.

Change-Id: I9d049128206c4acf0ce14b06b66d6c090a7c5242
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-12-20 17:05:30 +01:00
parent 2f5365bf61
commit c95bde6f6a
73 changed files with 140 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,8 +140,8 @@ static FilePath aabPath(const BuildConfiguration *bc)
.pathAppended(QString("build/outputs/bundle/%1/android-build-%1.aab").arg(buildType));
}
AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent)
: AbstractProcessStep(parent, Constants::ANDROID_BUILD_APK_ID),
AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent, Core::Id id)
: AbstractProcessStep(parent, id),
m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::
sdkManager()->latestAndroidSdkPlatform()))
{

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

@@ -43,7 +43,7 @@ class ANDROID_EXPORT AndroidBuildApkStep : public ProjectExplorer::AbstractProce
Q_OBJECT
public:
AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc);
AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, Core::Id id);
bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override;

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

@@ -137,8 +137,8 @@ public:
// AndroidDeployQtStep
AndroidDeployQtStep::AndroidDeployQtStep(ProjectExplorer::BuildStepList *parent)
: ProjectExplorer::BuildStep(parent, stepId())
AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Core::Id id)
: BuildStep(parent, id)
{
setImmutable(true);
m_uninstallPreviousPackage = QtSupport::QtKitAspect::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0);

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

@@ -64,8 +64,8 @@ public:
Uninstall,
ForceUnintall
};
public:
explicit AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc);
AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc, Core::Id id);
static Core::Id stepId();

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

@@ -48,8 +48,8 @@ using namespace Android::Internal;
namespace Android {
AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl)
: AbstractProcessStep(bsl, Constants::ANDROID_PACKAGE_INSTALLATION_STEP_ID)
AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Core::Id id)
: AbstractProcessStep(bsl, id)
{
const QString name = tr("Copy application data");
setDefaultDisplayName(name);

2
src/plugins/android/androidpackageinstallationstep.h
View File

@@ -37,7 +37,7 @@ class ANDROID_EXPORT AndroidPackageInstallationStep : public ProjectExplorer::Ab
Q_OBJECT
public:
explicit AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl);
AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;