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/qmlprojectmanager | |
| 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/qmlprojectmanager')
4 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp index 7e2efa3844c..cfb11e05778 100644 --- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp @@ -41,6 +41,8 @@ #include <QComboBox> +#include <utils/layoutbuilder.h> + using namespace Core; using namespace ProjectExplorer; @@ -69,7 +71,7 @@ QmlMainFileAspect::~QmlMainFileAspect() delete m_fileListCombo; } -void QmlMainFileAspect::addToLayout(LayoutBuilder &builder) +void QmlMainFileAspect::addToLayout(Utils::LayoutBuilder &builder) { QTC_ASSERT(!m_fileListCombo, delete m_fileListCombo); m_fileListCombo = new QComboBox; diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.h b/src/plugins/qmlprojectmanager/qmlmainfileaspect.h index 61a7b337b7f..7eacb128b22 100644 --- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.h +++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.h @@ -44,7 +44,7 @@ namespace QmlProjectManager { class QmlProject; class QmlBuildSystem; -class QMLPROJECTMANAGER_EXPORT QmlMainFileAspect : public ProjectExplorer::ProjectConfigurationAspect +class QMLPROJECTMANAGER_EXPORT QmlMainFileAspect : public Utils::BaseAspect { Q_OBJECT public: @@ -57,7 +57,7 @@ public: FileInSettings }; - void addToLayout(ProjectExplorer::LayoutBuilder &builder) final; + void addToLayout(Utils::LayoutBuilder &builder) final; void toMap(QVariantMap &map) const final; void fromMap(const QVariantMap &map) final; diff --git a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h index 47cbda9bf9c..5eae6c78948 100644 --- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h +++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h @@ -33,7 +33,7 @@ namespace QmlProjectManager { -class QMLPROJECTMANAGER_EXPORT QmlMultiLanguageAspect : public ProjectExplorer::BoolAspect +class QMLPROJECTMANAGER_EXPORT QmlMultiLanguageAspect : public Utils::BoolAspect { Q_OBJECT public: diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index a5a01d058ff..f5d144875e1 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -40,11 +40,11 @@ #include <projectexplorer/runconfigurationaspects.h> #include <projectexplorer/target.h> #include <projectexplorer/environmentaspect.h> -#include <projectexplorer/projectconfigurationaspects.h> #include <qtsupport/qtkitinformation.h> #include <qtsupport/qtsupportconstants.h> +#include <utils/aspects.h> #include <utils/environment.h> #include <utils/fileutils.h> #include <utils/mimetypes/mimedatabase.h> |