From 00f427f68e8a36904d2999e98d685c3540e289cd Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 31 May 2023 18:03:31 +0200
Subject: [PATCH] QmakeProjectManager: Auto-register aspects

Change-Id: I61b41b0155e125173e48686d1482bb8bd94055da
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/qmakeprojectmanager/qmakesettings.cpp | 3 ---
 src/plugins/qmakeprojectmanager/qmakesettings.h   | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/qmakesettings.cpp b/src/plugins/qmakeprojectmanager/qmakesettings.cpp
index f920381d15e..e69526901f0 100644
--- a/src/plugins/qmakeprojectmanager/qmakesettings.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakesettings.cpp
@@ -26,7 +26,6 @@ QmakeSettings::QmakeSettings()
     setCategory(ProjectExplorer::Constants::BUILD_AND_RUN_SETTINGS_CATEGORY);
     setSettingsGroup("QmakeProjectManager");
 
-    registerAspect(&warnAgainstUnalignedBuildDir);
     warnAgainstUnalignedBuildDir.setSettingsKey("WarnAgainstUnalignedBuildDir");
     warnAgainstUnalignedBuildDir.setDefaultValue(HostOsInfo::isWindowsHost());
     warnAgainstUnalignedBuildDir.setLabelText(Tr::tr("Warn if a project's source and "
@@ -34,13 +33,11 @@ QmakeSettings::QmakeSettings()
     warnAgainstUnalignedBuildDir.setToolTip(Tr::tr("Qmake has subtle bugs that "
         "can be triggered if source and build directory are not at the same level."));
 
-    registerAspect(&alwaysRunQmake);
     alwaysRunQmake.setSettingsKey("AlwaysRunQmake");
     alwaysRunQmake.setLabelText(Tr::tr("Run qmake on every build"));
     alwaysRunQmake.setToolTip(Tr::tr("This option can help to prevent failures on "
         "incremental builds, but might slow them down unnecessarily in the general case."));
 
-    registerAspect(&ignoreSystemFunction);
     ignoreSystemFunction.setSettingsKey("RunSystemFunction");
     ignoreSystemFunction.setLabelText(Tr::tr("Ignore qmake's system() function when parsing a project"));
     ignoreSystemFunction.setToolTip(Tr::tr("Checking this option avoids unwanted side effects, "
diff --git a/src/plugins/qmakeprojectmanager/qmakesettings.h b/src/plugins/qmakeprojectmanager/qmakesettings.h
index de9a9ec0d37..9c2b277f538 100644
--- a/src/plugins/qmakeprojectmanager/qmakesettings.h
+++ b/src/plugins/qmakeprojectmanager/qmakesettings.h
@@ -14,9 +14,9 @@ public:
 
     bool runSystemFunction() { return !ignoreSystemFunction(); }
 
-    Utils::BoolAspect warnAgainstUnalignedBuildDir;
-    Utils::BoolAspect alwaysRunQmake;
-    Utils::BoolAspect ignoreSystemFunction;
+    Utils::BoolAspect warnAgainstUnalignedBuildDir{this};
+    Utils::BoolAspect alwaysRunQmake{this};
+    Utils::BoolAspect ignoreSystemFunction{this};
 };
 
 QmakeSettings &settings();