From 001d4c10a779c34f64acfb6f12d357d1ed4f11aa Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 12 Sep 2017 11:28:23 +0200
Subject: [PATCH] Debugger: Remove use of setRunParameter() for state auto test

... which are disabled anyway.

Change-Id: Id15de0e5b766373570d89bacf02464e46f5b2b89
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/debugger/debuggerplugin.cpp     | 11 ++++-------
 src/plugins/debugger/debuggerruncontrol.cpp |  5 +++++
 src/plugins/debugger/debuggerruncontrol.h   |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index f7983e038bf..4a54695510c 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -3699,19 +3699,16 @@ void DebuggerUnitTests::testStateMachine()
     ProjectExplorerPlugin::buildProject(SessionManager::startupProject());
     loop.exec();
 
-    ExecuteOnDestruction guard([] () {
-        EditorManager::closeAllEditors(false);
-    });
-    DebuggerRunParameters rp;
+    ExecuteOnDestruction guard([] { EditorManager::closeAllEditors(false); });
+
     Target *t = SessionManager::startupProject()->activeTarget();
     QVERIFY(t);
     RunConfiguration *rc = t->activeRunConfiguration();
     QVERIFY(rc);
-    rp.inferior = rc->runnable().as<StandardRunnable>();
-    rp.testCase = TestNoBoundsOfCurrentFunction;
 
     auto debugger = DebuggerRunTool::createFromRunConfiguration(rc);
-    debugger->setRunParameters(rp);
+    debugger->setInferior(rc->runnable().as<StandardRunnable>());
+    debugger->setTestCase(TestNoBoundsOfCurrentFunction);
 
     connect(debugger, &DebuggerRunTool::stopped,
             &QTestEventLoop::instance(), &QTestEventLoop::exitLoop);
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index eb2f280a69e..e82e7f2066e 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -286,6 +286,11 @@ void DebuggerRunTool::setNeedFixup(bool on)
     m_runParameters.needFixup = on;
 }
 
+void DebuggerRunTool::setTestCase(int testCase)
+{
+    m_runParameters.testCase = testCase;
+}
+
 void DebuggerRunTool::setInferior(const Runnable &runnable)
 {
     QTC_ASSERT(runnable.is<StandardRunnable>(), reportFailure(); return);
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index ab2980969e5..2ff3e073e7c 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -121,6 +121,7 @@ public:
     void setDeviceSymbolsRoot(const QString &deviceSymbolsRoot);
 
     void setNeedFixup(bool on);
+    void setTestCase(int testCase);
 
 signals:
     void aboutToNotifyInferiorSetupOk();