AutoTest: Separate settings

This is a preparation for providing a way to let a framework define
its own settings.
This patch breaks old (framework) settings as some options have been
renamed and/or moved into sub groups.

Change-Id: If43678bcf75f6153adba52ebdfb12cd7c043ad25
Reviewed-by: David Schulz <david.schulz@qt.io>

src/plugins/autotest/testsettings.h

@@ -25,6 +25,9 @@
 
 #pragma once
 
+#include "gtest/gtestsettings.h"
+#include "qtest/qttestsettings.h"
+
 #include <QHash>
 
 namespace Core { class Id; }
@@ -36,37 +39,23 @@ QT_END_NAMESPACE
 namespace Autotest {
 namespace Internal {
 
-enum MetricsType {
-    Walltime,
-    TickCounter,
-    EventCounter,
-    CallGrind,
-    Perf
-};
-
 struct TestSettings
 {
     TestSettings();
     void toSettings(QSettings *s) const;
-    void fromSettings(const QSettings *s);
+    void fromSettings(QSettings *s);
     static QString metricsTypeToOption(const MetricsType type);
 
     int timeout;
-    int gtestIterations;
-    int gtestSeed;
-    MetricsType metrics;
-    bool omitInternalMssg;
-    bool omitRunConfigWarn;
-    bool limitResultOutput;
-    bool autoScroll;
-    bool alwaysParse;
-    bool qtestNoCrashHandler;
-    bool gtestRunDisabled;
-    bool gtestShuffle;
-    bool gtestRepeat;
-    bool gtestThrowOnFailure;
-    bool gtestBreakOnFailure;
+    bool omitInternalMssg = true;
+    bool omitRunConfigWarn = false;
+    bool limitResultOutput = true;
+    bool autoScroll = true;
+    bool alwaysParse = true;
     QHash<Core::Id, bool> frameworks;
+
+    QtTestSettings qtTestSettings;
+    GTestSettings gTestSettings;
 };
 
 } // namespace Internal