Use simpler IOptionPage::setLayouter overload in a few more places

Change-Id: Id3745dab4363279219062462492b3a3e789776be
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

src/plugins/autotest/ctest/ctestsettings.cpp

@@ -20,8 +20,8 @@ CTestSettings::CTestSettings(Id settingsId)
     setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
     setDisplayName(Tr::tr("CTest"));
 
-    setLayouter([this](QWidget *w) {
-        Row { Form {
+    setLayouter([this] {
+        return Row { Form {
             outputOnFail, br,
             scheduleRandom, br,
             stopOnFailure, br,
@@ -39,7 +39,7 @@ CTestSettings::CTestSettings(Id settingsId)
                     Row { testLoad, threshold}
                 }
             }
-        }, st }.attachTo(w);
+        }, st };
     });
 
     outputOnFail.setSettingsKey("OutputOnFail");

src/plugins/cmakeprojectmanager/cmakeformatter.cpp

@@ -65,9 +65,9 @@ public:
         autoFormatMime.setDefaultValue("text/x-cmake");
         autoFormatMime.setLabelText(Tr::tr("Restrict to MIME types:"));
 
-        setLayouter([this](QWidget *widget) {
+        setLayouter([this] {
             using namespace Layouting;
-            Column {
+            return Column {
                 Row { Tr::tr("CMakeFormat command:"), command },
                 Space(10),
                 Group {
@@ -79,7 +79,7 @@ public:
                     }
                 },
                 st
-            }.attachTo(widget);
+            };
         });
 
         ActionContainer *menu = ActionManager::createMenu(Constants::CMAKEFORMATTER_MENU_ID);

src/plugins/nim/settings/nimsettings.cpp

@@ -33,15 +33,15 @@ NimSettings::NimSettings()
     setDisplayCategory(Tr::tr("Nim"));
     setCategoryIconPath(":/nim/images/settingscategory_nim.png");
 
-    setLayouter([this](QWidget *widget) {
+    setLayouter([this] {
         using namespace Layouting;
-        Column {
+        return Column {
             Group {
                 title("Nimsuggest"),
                 Column { nimSuggestPath }
             },
             st
-        }.attachTo(widget);
+        };
     });
 
     // code style factory

src/plugins/projectexplorer/buildpropertiessettings.cpp

@@ -29,10 +29,10 @@ BuildPropertiesSettings::BuildPropertiesSettings()
     setCategory(ProjectExplorer::Constants::BUILD_AND_RUN_SETTINGS_CATEGORY);
     setSettings(this);
 
-    setLayouter([this](QWidget *widget) {
+    setLayouter([this] {
         using namespace Layouting;
 
-        Column {
+        return Column {
             Form {
                 buildDirectoryTemplate, br,
                 separateDebugInfo, br,
@@ -40,7 +40,7 @@ BuildPropertiesSettings::BuildPropertiesSettings()
                 qtQuickCompiler
             },
             st
-        }.attachTo(widget);
+        };
     });
 
     registerAspect(&buildDirectoryTemplate);

src/plugins/qmakeprojectmanager/qmakesettings.cpp

@@ -51,14 +51,14 @@ QmakeSettings::QmakeSettings()
     ignoreSystemFunction.setFromSettingsTransformation(invertBoolVariant);
     ignoreSystemFunction.setToSettingsTransformation(invertBoolVariant);
 
-    setLayouter([this](QWidget *widget) {
+    setLayouter([this] {
         using namespace Layouting;
-        Column {
+        return Column {
             warnAgainstUnalignedBuildDir,
             alwaysRunQmake,
             ignoreSystemFunction,
             st
-        }.attachTo(widget);
+        };
     });
 
     readSettings();