1 files changed, 9 insertions, 13 deletions
diff --git a/src/plugins/autotest/quick/quicktestconfiguration.cpp b/src/plugins/autotest/quick/quicktestconfiguration.cpp
index 57d075fe7d..22abcb5df5 100644
--- a/src/plugins/autotest/quick/quicktestconfiguration.cpp
+++ b/src/plugins/autotest/quick/quicktestconfiguration.cpp
@@ -29,13 +29,16 @@
 #include "../qtest/qttestsettings.h"
 #include "../qtest/qttest_utils.h"
 #include "../autotestplugin.h"
-#include "../testframeworkmanager.h"
+#include "../itestframework.h"
 #include "../testsettings.h"
 
+#include <utils/stringutils.h>
+
 namespace Autotest {
 namespace Internal {
 
-QuickTestConfiguration::QuickTestConfiguration()
+QuickTestConfiguration::QuickTestConfiguration(ITestFramework *framework)
+    : DebuggableTestConfiguration(framework)
 {
     setMixedDebugging(true);
 }
@@ -43,10 +46,7 @@ QuickTestConfiguration::QuickTestConfiguration()
 TestOutputReader *QuickTestConfiguration::outputReader(const QFutureInterface<TestResultPtr> &fi,
                                                        QProcess *app) const
 {
-    static const Core::Id id
-            = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME);
-    TestFrameworkManager *manager = TestFrameworkManager::instance();
-    auto qtSettings = qSharedPointerCast<QtTestSettings>(manager->settingsForTestFramework(id));
+    auto qtSettings = dynamic_cast<QtTestSettings *>(framework()->frameworkSettings());
     const QtTestOutputReader::OutputMode mode = qtSettings && qtSettings->useXMLOutput
             ? QtTestOutputReader::XML
             : QtTestOutputReader::PlainText;
@@ -56,19 +56,15 @@ TestOutputReader *QuickTestConfiguration::outputReader(const QFutureInterface<Te
 
 QStringList QuickTestConfiguration::argumentsForTestRunner(QStringList *omitted) const
 {
-    static const Core::Id id
-            = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME);
-
     QStringList arguments;
     if (AutotestPlugin::settings()->processArgs) {
         arguments.append(QTestUtils::filterInterfering
-                         (runnable().commandLineArguments.split(' ', QString::SkipEmptyParts),
+                         (runnable().commandLineArguments.split(' ', Utils::SkipEmptyParts),
                           omitted, true));
     }
 
-    TestFrameworkManager *manager = TestFrameworkManager::instance();
-    auto qtSettings = qSharedPointerCast<QtTestSettings>(manager->settingsForTestFramework(id));
-    if (qtSettings.isNull())
+    auto qtSettings = dynamic_cast<QtTestSettings *>(framework()->frameworkSettings());
+    if (!qtSettings)
         return arguments;
     if (qtSettings->useXMLOutput)
         arguments << "-xml";