3 files changed, 10 insertions, 13 deletions
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 5fe9576b21d..85b00d02a1f 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -677,12 +677,12 @@ DebuggerSettings::DebuggerSettings()
     all.registerAspect(&breakOnCatch); // ??
 
     // Collect all
-    all.registerAspect(&page1);
-    all.registerAspect(&page2);
-    all.registerAspect(&page3);
-    all.registerAspect(&page4);
-    all.registerAspect(&page5);
-    all.registerAspect(&page6);
+    all.registerAspects(page1);
+    all.registerAspects(page2);
+    all.registerAspects(page3);
+    all.registerAspects(page4);
+    all.registerAspects(page5);
+    all.registerAspects(page6);
 
     all.forEachAspect([](BaseAspect *aspect) {
         aspect->setAutoApply(false);
diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp
index 7e171236fe2..ec1d7d4727c 100644
--- a/src/plugins/projectexplorer/makestep.cpp
+++ b/src/plugins/projectexplorer/makestep.cpp
@@ -83,9 +83,7 @@ MakeStep::MakeStep(BuildStepList *parent, Id id)
     m_userArgumentsAspect->setLabelText(tr("Make arguments:"));
     m_userArgumentsAspect->setDisplayStyle(StringAspect::LineEditDisplay);
 
-    m_jobCountContainer = addAspect<AspectContainer>();
-
-    m_userJobCountAspect = m_jobCountContainer->addAspect<IntegerAspect>();
+    m_userJobCountAspect = addAspect<IntegerAspect>();
     m_userJobCountAspect->setSettingsKey(id.withSuffix(JOBCOUNT_SUFFIX).toString());
     m_userJobCountAspect->setLabel(tr("Parallel jobs:"));
     m_userJobCountAspect->setRange(1, 999);
@@ -93,11 +91,11 @@ MakeStep::MakeStep(BuildStepList *parent, Id id)
     m_userJobCountAspect->setDefaultValue(defaultJobCount());
 
     const QString text = tr("Override MAKEFLAGS");
-    m_overrideMakeflagsAspect = m_jobCountContainer->addAspect<BoolAspect>();
+    m_overrideMakeflagsAspect = addAspect<BoolAspect>();
     m_overrideMakeflagsAspect->setSettingsKey(id.withSuffix(OVERRIDE_MAKEFLAGS_SUFFIX).toString());
     m_overrideMakeflagsAspect->setLabel(text, BoolAspect::LabelPlacement::AtCheckBox);
 
-    m_nonOverrideWarning = m_jobCountContainer->addAspect<TextDisplay>();
+    m_nonOverrideWarning = addAspect<TextDisplay>();
     m_nonOverrideWarning->setToolTip("<html><body><p>" +
          tr("<code>MAKEFLAGS</code> specifies parallel jobs. Check \"%1\" to override.")
          .arg(text) + "</p></body></html>");
@@ -353,7 +351,7 @@ QWidget *MakeStep::createConfigWidget()
     LayoutBuilder builder(widget);
     builder.addRow(m_makeCommandAspect);
     builder.addRow(m_userArgumentsAspect);
-    builder.addRow(m_jobCountContainer);
+    builder.addRow({m_userJobCountAspect, m_overrideMakeflagsAspect, m_nonOverrideWarning});
     if (m_disablingForSubDirsSupported)
         builder.addRow(m_disabledForSubdirsAspect);
     builder.addRow(m_buildTargetsAspect);
diff --git a/src/plugins/projectexplorer/makestep.h b/src/plugins/projectexplorer/makestep.h
index 2b805b12640..5d6e99dda60 100644
--- a/src/plugins/projectexplorer/makestep.h
+++ b/src/plugins/projectexplorer/makestep.h
@@ -95,7 +95,6 @@ private:
     QStringList m_availableTargets; // FIXME: Unused, remove in 4.15.
     Utils::StringAspect *m_makeCommandAspect = nullptr;
     Utils::StringAspect *m_userArgumentsAspect = nullptr;
-    Utils::AspectContainer *m_jobCountContainer = nullptr;
     Utils::IntegerAspect *m_userJobCountAspect = nullptr;
     Utils::BoolAspect *m_overrideMakeflagsAspect = nullptr;
     Utils::BoolAspect *m_disabledForSubdirsAspect = nullptr;