diff options
| author | hjk <hjk@qt.io> | 2020-09-18 12:11:40 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-09-23 07:44:42 +0000 |
| commit | cec468d78a57b2858d3b5c03ccb5c5c1928d628c (patch) | |
| tree | 1118e25efb84695de335768aae04818e9685dd84 /src/plugins/incredibuild | |
| parent | 834cb8d114110d4905c007f45841fd1045851ec7 (diff) | |
Utils/ProjectExplorer: Move re-usabled bits of aspects to Utils
Classes involved are BaseAspect and some derived classes,
LayoutBuilder and VariableChooser.
This is mostly mechanical, with various include/using changes
to make it compile.
Change-Id: I624a457f3555f102e541c4c71e33a9423af32250
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/incredibuild')
4 files changed, 10 insertions, 5 deletions
diff --git a/src/plugins/incredibuild/buildconsolebuildstep.cpp b/src/plugins/incredibuild/buildconsolebuildstep.cpp index c8f7b3409e..65cc943de4 100644 --- a/src/plugins/incredibuild/buildconsolebuildstep.cpp +++ b/src/plugins/incredibuild/buildconsolebuildstep.cpp @@ -33,9 +33,10 @@ #include <projectexplorer/gnumakeparser.h> #include <projectexplorer/kit.h> #include <projectexplorer/processparameters.h> -#include <projectexplorer/projectconfigurationaspects.h> +#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> +#include <utils/aspects.h> #include <utils/environment.h> using namespace ProjectExplorer; diff --git a/src/plugins/incredibuild/commandbuilderaspect.cpp b/src/plugins/incredibuild/commandbuilderaspect.cpp index be5272ed75..724e38d2ce 100644 --- a/src/plugins/incredibuild/commandbuilderaspect.cpp +++ b/src/plugins/incredibuild/commandbuilderaspect.cpp @@ -34,6 +34,7 @@ #include <projectexplorer/project.h> #include <utils/environment.h> +#include <utils/layoutbuilder.h> #include <utils/pathchooser.h> #include <QComboBox> diff --git a/src/plugins/incredibuild/commandbuilderaspect.h b/src/plugins/incredibuild/commandbuilderaspect.h index f2fccd340c..b2f507bc0b 100644 --- a/src/plugins/incredibuild/commandbuilderaspect.h +++ b/src/plugins/incredibuild/commandbuilderaspect.h @@ -26,7 +26,8 @@ #pragma once #include <projectexplorer/buildstep.h> -#include <projectexplorer/projectconfigurationaspects.h> + +#include <utils/aspects.h> #include <QLabel> #include <QPointer> @@ -34,7 +35,7 @@ namespace IncrediBuild { namespace Internal { -class CommandBuilderAspect final : public ProjectExplorer::ProjectConfigurationAspect +class CommandBuilderAspect final : public Utils::BaseAspect { public: explicit CommandBuilderAspect(ProjectExplorer::BuildStep *step); @@ -43,7 +44,7 @@ public: QString fullCommandFlag(bool keepJobNum) const; private: - void addToLayout(ProjectExplorer::LayoutBuilder &builder) final; + void addToLayout(Utils::LayoutBuilder &builder) final; void fromMap(const QVariantMap &map) final; void toMap(QVariantMap &map) const final; diff --git a/src/plugins/incredibuild/ibconsolebuildstep.cpp b/src/plugins/incredibuild/ibconsolebuildstep.cpp index 4d118af097..a0e4b8bb97 100644 --- a/src/plugins/incredibuild/ibconsolebuildstep.cpp +++ b/src/plugins/incredibuild/ibconsolebuildstep.cpp @@ -33,9 +33,11 @@ #include <projectexplorer/gnumakeparser.h> #include <projectexplorer/kit.h> #include <projectexplorer/processparameters.h> -#include <projectexplorer/projectconfigurationaspects.h> +#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> +#include <utils/aspects.h> + using namespace ProjectExplorer; using namespace Utils; |