diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index bb637f31b02..3dc5da0a4b4 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -2162,8 +2162,11 @@ void DoubleAspect::setSingleStep(double step)
     Its visual representation is a QComboBox with three items.
 */
 
-TriStateAspect::TriStateAspect(const QString &onString, const QString &offString,
+TriStateAspect::TriStateAspect(AspectContainer *container,
+                               const QString &onString,
+                               const QString &offString,
                                const QString &defaultString)
+    : SelectionAspect(container)
 {
     setDisplayStyle(DisplayStyle::ComboBox);
     setDefaultValue(TriState::Default);
diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h
index db3c036cec3..a0ebf5a045a 100644
--- a/src/libs/utils/aspects.h
+++ b/src/libs/utils/aspects.h
@@ -549,7 +549,8 @@ class QTCREATOR_UTILS_EXPORT TriStateAspect : public SelectionAspect
     Q_OBJECT
 
 public:
-    TriStateAspect(const QString &onString = {},
+    TriStateAspect(AspectContainer *container = nullptr,
+                   const QString &onString = {},
                    const QString &offString = {},
                    const QString &defaultString = {});
 
diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
index 4b67e82fd86..8c118f553b6 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -101,11 +101,11 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
     addDataExtractor(this, &DebuggerRunConfigurationAspect::useMultiProcess, &Data::useMultiProcess);
     addDataExtractor(this, &DebuggerRunConfigurationAspect::overrideStartup, &Data::overrideStartup);
 
-    m_cppAspect = new TriStateAspect(Tr::tr("Enabled"), Tr::tr("Disabled"), Tr::tr("Automatic"));
+    m_cppAspect = new TriStateAspect(nullptr, Tr::tr("Enabled"), Tr::tr("Disabled"), Tr::tr("Automatic"));
     m_cppAspect->setLabelText(Tr::tr("C++ debugger:"));
     m_cppAspect->setSettingsKey("RunConfiguration.UseCppDebugger");
 
-    m_qmlAspect = new TriStateAspect(Tr::tr("Enabled"), Tr::tr("Disabled"), Tr::tr("Automatic"));
+    m_qmlAspect = new TriStateAspect(nullptr, Tr::tr("Enabled"), Tr::tr("Disabled"), Tr::tr("Automatic"));
     m_qmlAspect->setLabelText(Tr::tr("QML debugger:"));
     m_qmlAspect->setSettingsKey("RunConfiguration.UseQmlDebugger");
 
diff --git a/src/plugins/projectexplorer/buildpropertiessettings.cpp b/src/plugins/projectexplorer/buildpropertiessettings.cpp
index 88c63b5f5c1..6df8fdd328e 100644
--- a/src/plugins/projectexplorer/buildpropertiessettings.cpp
+++ b/src/plugins/projectexplorer/buildpropertiessettings.cpp
@@ -16,8 +16,8 @@ namespace ProjectExplorer {
 const char DEFAULT_BUILD_DIRECTORY_TEMPLATE[]
     = "../%{JS: Util.asciify(\"build-%{Project:Name}-%{Kit:FileSystemName}-%{BuildConfig:Name}\")}";
 
-BuildPropertiesSettings::BuildTriStateAspect::BuildTriStateAspect()
-    : TriStateAspect{Tr::tr("Enable"), Tr::tr("Disable"), Tr::tr("Use Project Default")}
+BuildPropertiesSettings::BuildTriStateAspect::BuildTriStateAspect(AspectContainer *container)
+    : TriStateAspect(container, Tr::tr("Enable"), Tr::tr("Disable"), Tr::tr("Use Project Default"))
 {}
 
 BuildPropertiesSettings::BuildPropertiesSettings()
@@ -43,7 +43,6 @@ BuildPropertiesSettings::BuildPropertiesSettings()
         };
     });
 
-    registerAspect(&buildDirectoryTemplate);
     buildDirectoryTemplate.setDisplayStyle(StringAspect::LineEditDisplay);
     buildDirectoryTemplate.setSettingsKey("Directories/BuildDirectory.TemplateV2");
     buildDirectoryTemplate.setDefaultValue(DEFAULT_BUILD_DIRECTORY_TEMPLATE);
@@ -51,15 +50,12 @@ BuildPropertiesSettings::BuildPropertiesSettings()
     buildDirectoryTemplate.setUseGlobalMacroExpander();
     buildDirectoryTemplate.setUseResetButton();
 
-    registerAspect(&separateDebugInfo);
     separateDebugInfo.setSettingsKey("ProjectExplorer/Settings/SeparateDebugInfo");
     separateDebugInfo.setLabelText(Tr::tr("Separate debug info:"));
 
-    registerAspect(&qmlDebugging);
     qmlDebugging.setSettingsKey("ProjectExplorer/Settings/QmlDebugging");
     qmlDebugging.setLabelText(Tr::tr("QML debugging:"));
 
-    registerAspect(&qtQuickCompiler);
     qtQuickCompiler.setSettingsKey("ProjectExplorer/Settings/QtQuickCompiler");
     qtQuickCompiler.setLabelText(Tr::tr("Use qmlcachegen:"));
 
diff --git a/src/plugins/projectexplorer/buildpropertiessettings.h b/src/plugins/projectexplorer/buildpropertiessettings.h
index 4d028788d51..3b1b2b7c698 100644
--- a/src/plugins/projectexplorer/buildpropertiessettings.h
+++ b/src/plugins/projectexplorer/buildpropertiessettings.h
@@ -17,13 +17,13 @@ public:
     class BuildTriStateAspect : public Utils::TriStateAspect
     {
     public:
-        BuildTriStateAspect();
+        explicit BuildTriStateAspect(AspectContainer *container);
     };
 
-    Utils::StringAspect buildDirectoryTemplate;
-    BuildTriStateAspect separateDebugInfo;
-    BuildTriStateAspect qmlDebugging;
-    BuildTriStateAspect qtQuickCompiler;
+    Utils::StringAspect buildDirectoryTemplate{this};
+    BuildTriStateAspect separateDebugInfo{this};
+    BuildTriStateAspect qmlDebugging{this};
+    BuildTriStateAspect qtQuickCompiler{this};
     Utils::BoolAspect showQtSettings;
 
     QString defaultBuildDirectoryTemplate();
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
index 173443958db..9da9f7f65a7 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
@@ -57,7 +57,8 @@ class RunSystemAspect : public TriStateAspect
 {
     Q_OBJECT
 public:
-    RunSystemAspect() : TriStateAspect(Tr::tr("Run"), Tr::tr("Ignore"), Tr::tr("Use global setting"))
+    RunSystemAspect()
+        : TriStateAspect(nullptr, Tr::tr("Run"), Tr::tr("Ignore"), Tr::tr("Use global setting"))
     {
         setSettingsKey("RunSystemFunction");
         setDisplayName(Tr::tr("qmake system() behavior when parsing:"));