AutoTest: Some layout polishing

Layouts are simpler nowadays. Some drive-by formatting
changes.

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

5 files changed, 26 insertions, 32 deletions

diff --git a/src/plugins/autotest/boost/boosttestsettings.cpp b/src/plugins/autotest/boost/boosttestsettings.cpp
index fc2ce851e6..840647572a 100644
--- a/src/plugins/autotest/boost/boosttestsettings.cpp
+++ b/src/plugins/autotest/boost/boosttestsettings.cpp
@@ -65,7 +65,7 @@ BoostTestSettings::BoostTestSettings(Id settingsId)
     seed.setEnabled(false);
     seed.setLabelText(Tr::tr("Seed:"));
     seed.setToolTip(Tr::tr("A seed of 0 means no randomization. A value of 1 uses the current "
-        "time, any other value is used as random seed generator."));
+                           "time, any other value is used as random seed generator."));
     seed.setEnabler(&randomize);
 
     registerAspect(&randomize);
diff --git a/src/plugins/autotest/catch/catchtestsettings.cpp b/src/plugins/autotest/catch/catchtestsettings.cpp
index 12b5c1094f..07dac310eb 100644
--- a/src/plugins/autotest/catch/catchtestsettings.cpp
+++ b/src/plugins/autotest/catch/catchtestsettings.cpp
@@ -23,7 +23,7 @@ CatchTestSettings::CatchTestSettings(Id settingsId)
     setSettingsGroups("Autotest", "Catch2");
 
     setLayouter([this](QWidget *widget) {
-        Column { Row { Grid {
+        Row { Form {
             showSuccess, br,
             breakOnFailure, br,
             noThrow, br,
@@ -34,7 +34,7 @@ CatchTestSettings::CatchTestSettings(Id settingsId)
             confidenceIntervalChecked, confidenceInterval, br,
             warmupChecked, benchmarkWarmupTime, br,
             noAnalysis
-        }, st }, st }.attachTo(widget);
+        }, st }.attachTo(widget);
     });
 
     registerAspect(&abortAfter);
diff --git a/src/plugins/autotest/ctest/ctestsettings.cpp b/src/plugins/autotest/ctest/ctestsettings.cpp
index b8485530e1..e200de98e8 100644
--- a/src/plugins/autotest/ctest/ctestsettings.cpp
+++ b/src/plugins/autotest/ctest/ctestsettings.cpp
@@ -21,7 +21,7 @@ CTestSettings::CTestSettings(Id settingsId)
     setDisplayName(Tr::tr("CTest"));
 
     setLayouter([this](QWidget *w) {
-        Column { Row { Form {
+        Row { Form {
             outputOnFail, br,
             scheduleRandom, br,
             stopOnFailure, br,
@@ -39,7 +39,7 @@ CTestSettings::CTestSettings(Id settingsId)
                     Row { testLoad, threshold}
                 }
             }
-        }, st }, st }.attachTo(w);
+        }, st }.attachTo(w);
     });
 
     registerAspect(&outputOnFail);
@@ -95,7 +95,7 @@ CTestSettings::CTestSettings(Id settingsId)
     testLoad.setSettingsKey("TestLoad");
     testLoad.setLabelText(Tr::tr("Test load"));
     testLoad.setToolTip(Tr::tr("Try not to start tests when they may cause CPU load to pass a "
-                           "threshold."));
+                               "threshold."));
 
     registerAspect(&threshold);
     threshold.setSettingsKey("Threshold");
diff --git a/src/plugins/autotest/gtest/gtestsettings.cpp b/src/plugins/autotest/gtest/gtestsettings.cpp
index 3979f28c75..d7302d6bd5 100644
--- a/src/plugins/autotest/gtest/gtestsettings.cpp
+++ b/src/plugins/autotest/gtest/gtestsettings.cpp
@@ -24,18 +24,14 @@ GTestSettings::GTestSettings(Id settingsId)
     setDisplayName(Tr::tr(GTest::Constants::FRAMEWORK_SETTINGS_CATEGORY));
 
     setLayouter([this](QWidget *widget) {
-        Column { Row { Column {
-            Grid {
+        Row { Form {
                 runDisabled, br,
                 breakOnFailure, br,
                 repeat, iterations, br,
-                shuffle, seed
-            },
-            Form {
-                groupMode,
-                gtestFilter
-            }
-        }, st }, st }.attachTo(widget);
+                shuffle, seed, br,
+                groupMode, br,
+                gtestFilter, br
+            }, st }.attachTo(widget);
     });
 
     registerAspect(&iterations);
@@ -66,7 +62,8 @@ GTestSettings::GTestSettings(Id settingsId)
     registerAspect(&repeat);
     repeat.setSettingsKey("Repeat");
     repeat.setLabelText(Tr::tr("Repeat tests"));
-    repeat.setToolTip(Tr::tr("Repeats a test run (you might be required to increase the timeout to avoid canceling the tests)."));
+    repeat.setToolTip(Tr::tr("Repeats a test run (you might be required to increase the timeout to "
+                             "avoid canceling the tests)."));
 
     registerAspect(&throwOnFailure);
     throwOnFailure.setSettingsKey("ThrowOnFailure");
@@ -110,8 +107,8 @@ GTestSettings::GTestSettings(Id settingsId)
     });
     gtestFilter.setEnabled(false);
     gtestFilter.setLabelText(Tr::tr("Active filter:"));
-    gtestFilter.setToolTip(Tr::tr("Set the GTest filter to be used for grouping.\n"
-        "See Google Test documentation for further information on GTest filters."));
+    gtestFilter.setToolTip(Tr::tr("Set the GTest filter to be used for grouping.\nSee Google Test "
+                                  "documentation for further information on GTest filters."));
 
     gtestFilter.setValidationFunction([](FancyLineEdit *edit, QString * /*error*/) {
         return edit && GTestUtils::isValidGTestFilter(edit->text());
diff --git a/src/plugins/autotest/qtest/qttestsettings.cpp b/src/plugins/autotest/qtest/qttestsettings.cpp
index 9832a0ed4a..07fac99d98 100644
--- a/src/plugins/autotest/qtest/qttestsettings.cpp
+++ b/src/plugins/autotest/qtest/qttestsettings.cpp
@@ -23,21 +23,18 @@ QtTestSettings::QtTestSettings(Id settingsId)
     setDisplayName(Tr::tr(QtTest::Constants::FRAMEWORK_SETTINGS_CATEGORY));
 
     setLayouter([this](QWidget *widget) {
-        Column { Row { Column {
-            noCrashHandler,
-            useXMLOutput,
-            verboseBench,
-            logSignalsSlots,
-            Row {
-                limitWarnings, maxWarnings
-            },
+        Row { Form {
+            noCrashHandler, br,
+            useXMLOutput, br,
+            verboseBench, br,
+            logSignalsSlots, br,
+            limitWarnings, maxWarnings, br,
             Group {
                 title(Tr::tr("Benchmark Metrics")),
                 Column { metrics }
-            },
-            br,
-            quickCheckForDerivedTests,
-        }, st }, st }.attachTo(widget);
+            }, br,
+            quickCheckForDerivedTests, br
+        }, st }.attachTo(widget);
     });
 
     registerAspect(&metrics);
@@ -68,8 +65,8 @@ QtTestSettings::QtTestSettings(Id settingsId)
     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");