1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/autotest/gtest/gtestconfiguration.cpp b/src/plugins/autotest/gtest/gtestconfiguration.cpp
index d2f869d7645..8680da1fcaf 100644
--- a/src/plugins/autotest/gtest/gtestconfiguration.cpp
+++ b/src/plugins/autotest/gtest/gtestconfiguration.cpp
@@ -5,22 +5,20 @@
 
 #include "gtestoutputreader.h"
 #include "gtestsettings.h"
-#include "../autotestplugin.h"
+
 #include "../itestframework.h"
 #include "../testsettings.h"
 
 #include <utils/algorithm.h>
-#include <utils/stringutils.h>
 
 using namespace Utils;
 
 namespace Autotest {
 namespace Internal {
 
-TestOutputReader *GTestConfiguration::createOutputReader(const QFutureInterface<TestResult> &fi,
-                                                         QtcProcess *app) const
+TestOutputReader *GTestConfiguration::createOutputReader(Process *app) const
 {
-    return new GTestOutputReader(fi, app, buildDirectory(), projectFile());
+    return new GTestOutputReader(app, buildDirectory(), projectFile());
 }
 
 QStringList filterInterfering(const QStringList &provided, QStringList *omitted)
@@ -56,7 +54,7 @@ QStringList filterInterfering(const QStringList &provided, QStringList *omitted)
 QStringList GTestConfiguration::argumentsForTestRunner(QStringList *omitted) const
 {
     QStringList arguments;
-    if (AutotestPlugin::settings()->processArgs) {
+    if (TestSettings::instance()->processArgs()) {
         arguments << filterInterfering(runnable().command.arguments().split(
                                            ' ', Qt::SkipEmptyParts), omitted);
     }