ProjectExplorer: Aspectify "disable for subdirs" MakeStep setting

Along the way, this also fixes that the setting was not preserved.

Change-Id: I753873a582e221d08c0350c3c38249e3330ae03c
Reviewed-by: hjk <hjk@qt.io>

src/plugins/projectexplorer/makestep.cpp

@@ -103,6 +103,11 @@ MakeStep::MakeStep(BuildStepList *parent, Id id)
          .arg(text) + "</p></body></html>");
     m_nonOverrideWarning->setIconType(InfoLabel::Warning);
 
+    m_disabledForSubdirsAspect = addAspect<BoolAspect>();
+    m_disabledForSubdirsAspect->setSettingsKey(id.withSuffix(".disabledForSubdirs").toString());
+    m_disabledForSubdirsAspect->setLabel(tr("Disable in subdirectories:"));
+    m_disabledForSubdirsAspect->setToolTip(tr("Runs this step only for a top-level build."));
+
     m_buildTargetsAspect = addAspect<MultiSelectionAspect>();
     m_buildTargetsAspect->setSettingsKey(id.withSuffix(BUILD_TARGETS_SUFFIX).toString());
     m_buildTargetsAspect->setLabelText(tr("Targets:"));
@@ -249,6 +254,11 @@ bool MakeStep::makeflagsJobCountMismatch() const
     return makeFlagsJobCount.has_value() && *makeFlagsJobCount != m_userJobCountAspect->value();
 }
 
+bool MakeStep::enabledForSubDirs() const
+{
+    return !m_disabledForSubdirsAspect->value();
+}
+
 bool MakeStep::makeflagsContainsJobCount() const
 {
     const Environment env = makeEnvironment();
@@ -340,26 +350,14 @@ QWidget *MakeStep::createConfigWidget()
 {
     auto widget = new QWidget;
 
-    auto disableInSubDirsLabel = new QLabel(tr("Disable in subdirectories:"), widget);
-    auto disableInSubDirsCheckBox = new QCheckBox(widget);
-    disableInSubDirsCheckBox->setToolTip(tr("Runs this step only for a top-level build."));
-
     LayoutBuilder builder(widget);
     builder.addRow(m_makeCommandAspect);
     builder.addRow(m_userArgumentsAspect);
     builder.addRow(m_jobCountContainer);
-    builder.addRow({disableInSubDirsLabel, disableInSubDirsCheckBox});
+    if (m_disablingForSubDirsSupported)
+        builder.addRow(m_disabledForSubdirsAspect);
     builder.addRow(m_buildTargetsAspect);
 
-    if (!m_disablingForSubDirsSupported) {
-        disableInSubDirsLabel->hide();
-        disableInSubDirsCheckBox->hide();
-    } else {
-        connect(disableInSubDirsCheckBox, &QCheckBox::toggled, this, [this](bool disabled) {
-            m_enabledForSubDirs = !disabled;
-        });
-    }
-
     VariableChooser::addSupportForChildWidgets(widget, macroExpander());
 
     setSummaryUpdater([this] {
@@ -384,7 +382,7 @@ QWidget *MakeStep::createConfigWidget()
         return param.summaryInWorkdir(displayName());
     });
 
-    auto updateDetails = [this, disableInSubDirsCheckBox] {
+    auto updateDetails = [this] {
         const bool jobCountVisible = isJobCountSupported();
         m_userJobCountAspect->setVisible(jobCountVisible);
         m_overrideMakeflagsAspect->setVisible(jobCountVisible);
@@ -394,7 +392,6 @@ QWidget *MakeStep::createConfigWidget()
         m_overrideMakeflagsAspect->setEnabled(jobCountEnabled);
         m_nonOverrideWarning->setVisible(makeflagsJobCountMismatch()
                                          && !jobCountOverridesMakeflags());
-        disableInSubDirsCheckBox->setChecked(!m_enabledForSubDirs);
     };
 
     updateDetails();

src/plugins/projectexplorer/makestep.h

@@ -74,7 +74,7 @@ public:
     bool makeflagsJobCountMismatch() const;
 
     bool disablingForSubdirsSupported() const { return m_disablingForSubDirsSupported; }
-    bool enabledForSubDirs() const { return m_enabledForSubDirs; }
+    bool enabledForSubDirs() const;
 
     Utils::Environment makeEnvironment() const;
 
@@ -98,9 +98,9 @@ private:
     Utils::AspectContainer *m_jobCountContainer = nullptr;
     Utils::IntegerAspect *m_userJobCountAspect = nullptr;
     Utils::BoolAspect *m_overrideMakeflagsAspect = nullptr;
+    Utils::BoolAspect *m_disabledForSubdirsAspect = nullptr;
     Utils::TextDisplay *m_nonOverrideWarning = nullptr;
     bool m_disablingForSubDirsSupported = false;
-    bool m_enabledForSubDirs = true;
 };
 
 } // namespace ProjectExplorer