1 files changed, 24 insertions, 47 deletions

diff --git a/src/plugins/autotest/qtest/qttestsettings.cpp b/src/plugins/autotest/qtest/qttestsettings.cpp
index 4be93d99379..a8953a04492 100644
--- a/src/plugins/autotest/qtest/qttestsettings.cpp
+++ b/src/plugins/autotest/qtest/qttestsettings.cpp
@@ -10,17 +10,33 @@
 #include <utils/hostosinfo.h>
 #include <utils/layoutbuilder.h>
 
+using namespace Layouting;
 using namespace Utils;
 
-namespace Autotest {
-namespace Internal {
+namespace Autotest::Internal {
 
-QtTestSettings::QtTestSettings()
+QtTestSettings::QtTestSettings(Id settingsId)
 {
     setSettingsGroups("Autotest", "QtTest");
-    setAutoApply(false);
+    setId(settingsId);
+    setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
+    setDisplayName(Tr::tr(QtTest::Constants::FRAMEWORK_SETTINGS_CATEGORY));
+
+    setLayouter([this] {
+        return Row { Form {
+            noCrashHandler, br,
+            useXMLOutput, br,
+            verboseBench, br,
+            logSignalsSlots, br,
+            limitWarnings, maxWarnings, br,
+            Group {
+                title(Tr::tr("Benchmark Metrics")),
+                Column { metrics }
+            }, br,
+            quickCheckForDerivedTests, br
+        }, st };
+    });
 
-    registerAspect(&metrics);
     metrics.setSettingsKey("Metrics");
     metrics.setDefaultValue(Walltime);
     metrics.addOption(Tr::tr("Walltime"), Tr::tr("Uses walltime metrics for executing benchmarks (default)."));
@@ -37,43 +53,36 @@ QtTestSettings::QtTestSettings()
         HostOsInfo::isLinuxHost() // according to docs perf Linux only
     });
 
-    registerAspect(&noCrashHandler);
     noCrashHandler.setSettingsKey("NoCrashhandlerOnDebug");
     noCrashHandler.setDefaultValue(true);
     noCrashHandler.setLabelText(Tr::tr("Disable crash handler while debugging"));
     noCrashHandler.setToolTip(Tr::tr("Enables interrupting tests on assertions."));
 
-    registerAspect(&useXMLOutput);
     useXMLOutput.setSettingsKey("UseXMLOutput");
     useXMLOutput.setDefaultValue(true);
     useXMLOutput.setLabelText(Tr::tr("Use XML output"));
     useXMLOutput.setToolTip(Tr::tr("XML output is recommended, because it avoids parsing issues, "
-        "while plain text is more human readable.\n\n"
-        "Warning: Plain text misses some information, such as duration."));
+                                   "while plain text is more human readable.\n\nWarning: "
+                                   "Plain text misses some information, such as duration."));
 
-    registerAspect(&verboseBench);
     verboseBench.setSettingsKey("VerboseBench");
     verboseBench.setLabelText(Tr::tr("Verbose benchmarks"));
 
-    registerAspect(&logSignalsSlots);
     logSignalsSlots.setSettingsKey("LogSignalsSlots");
     logSignalsSlots.setLabelText(Tr::tr("Log signals and slots"));
     logSignalsSlots.setToolTip(Tr::tr("Log every signal emission and resulting slot invocations."));
 
-    registerAspect(&limitWarnings);
     limitWarnings.setSettingsKey("LimitWarnings");
     limitWarnings.setLabelText(Tr::tr("Limit warnings"));
     limitWarnings.setToolTip(Tr::tr("Set the maximum number of warnings. 0 means that the number "
                                 "is not limited."));
 
-    registerAspect(&maxWarnings);
     maxWarnings.setSettingsKey("MaxWarnings");
     maxWarnings.setRange(0, 10000);
     maxWarnings.setDefaultValue(2000);
     maxWarnings.setSpecialValueText(Tr::tr("Unlimited"));
     maxWarnings.setEnabler(&limitWarnings);
 
-    registerAspect(&quickCheckForDerivedTests);
     quickCheckForDerivedTests.setSettingsKey("QuickCheckForDerivedTests");
     quickCheckForDerivedTests.setDefaultValue(false);
     quickCheckForDerivedTests.setLabelText(Tr::tr("Check for derived Qt Quick tests"));
@@ -99,36 +108,4 @@ QString QtTestSettings::metricsTypeToOption(const MetricsType type)
     return {};
 }
 
-QtTestSettingsPage::QtTestSettingsPage(QtTestSettings *settings, Id settingsId)
-{
-    setId(settingsId);
-    setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
-    setDisplayName(Tr::tr(QtTest::Constants::FRAMEWORK_SETTINGS_CATEGORY));
-    setSettings(settings);
-
-    setLayouter([settings](QWidget *widget) {
-        QtTestSettings &s = *settings;
-        using namespace Layouting;
-
-        Column col {
-            s.noCrashHandler,
-            s.useXMLOutput,
-            s.verboseBench,
-            s.logSignalsSlots,
-            Row {
-                s.limitWarnings, s.maxWarnings
-            },
-            Group {
-                title(Tr::tr("Benchmark Metrics")),
-                Column { s.metrics }
-            },
-            br,
-            s.quickCheckForDerivedTests,
-        };
-
-        Column { Row { col, st }, st }.attachTo(widget);
-    });
-}
-
-} // namespace Internal
-} // namespace Autotest
+} // Autotest::Internal