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>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h
index f414c105aa..5ef48876e3 100644
--- a/src/plugins/qbsprojectmanager/qbsinstallstep.h
+++ b/src/plugins/qbsprojectmanager/qbsinstallstep.h
@@ -29,11 +29,13 @@
 #include "qbssession.h"
 
 #include <projectexplorer/buildstep.h>
-#include <projectexplorer/projectconfigurationaspects.h>
 #include <projectexplorer/task.h>
 
+#include <utils/aspects.h>
+
 namespace QbsProjectManager {
 namespace Internal {
+
 class ErrorInfo;
 class QbsSession;
 
@@ -62,9 +64,9 @@ private:
     void createTaskAndOutput(ProjectExplorer::Task::TaskType type,
                              const QString &message, const Utils::FilePath &file, int line);
 
-    ProjectExplorer::BoolAspect *m_cleanInstallRoot = nullptr;
-    ProjectExplorer::BoolAspect *m_dryRun = nullptr;
-    ProjectExplorer::BoolAspect *m_keepGoing = nullptr;
+    Utils::BoolAspect *m_cleanInstallRoot = nullptr;
+    Utils::BoolAspect *m_dryRun = nullptr;
+    Utils::BoolAspect *m_keepGoing = nullptr;
 
     QbsSession *m_session = nullptr;
     QString m_description;