Debugger: Consolidate RunControl creation

Export factory, de-export plugin, to remove one indirection

Change-Id: I13a46460d07d5ded6b26f2b5ceccd01142fb10e8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

28 files changed, 101 insertions, 174 deletions

diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index b2e085e364..ef27165dd3 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -36,10 +36,9 @@
 #include "androidqtsupport.h"
 
 #include <debugger/debuggerengine.h>
-#include <debugger/debuggerplugin.h>
 #include <debugger/debuggerkitinformation.h>
 #include <debugger/debuggerrunconfigurationaspect.h>
-#include <debugger/debuggerrunner.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerstartparameters.h>
 
 #include <projectexplorer/buildconfiguration.h>
@@ -121,7 +120,7 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *
     }
 
     DebuggerRunControl * const debuggerRunControl
-        = DebuggerPlugin::createDebugger(params, runConfig, errorMessage);
+        = DebuggerRunControlFactory::doCreate(params, runConfig, errorMessage);
     new AndroidDebugSupport(runConfig, debuggerRunControl);
     return debuggerRunControl;
 }
diff --git a/src/plugins/baremetal/baremetalruncontrolfactory.cpp b/src/plugins/baremetal/baremetalruncontrolfactory.cpp
index 6252c0d1ed..3cb9b112e5 100644
--- a/src/plugins/baremetal/baremetalruncontrolfactory.cpp
+++ b/src/plugins/baremetal/baremetalruncontrolfactory.cpp
@@ -33,7 +33,7 @@
 #include "baremetalrunconfiguration.h"
 #include "baremetaldevice.h"
 
-#include <debugger/debuggerplugin.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerkitinformation.h>
 #include <projectexplorer/buildsteplist.h>
@@ -143,7 +143,7 @@ RunControl *BareMetalRunControlFactory::create(RunConfiguration *runConfiguratio
                 .arg(sp.executable);
         return 0;
     }
-    return DebuggerPlugin::createDebugger(sp,runConfiguration,errorMessage);
+    return DebuggerRunControlFactory::doCreate(sp, runConfiguration, errorMessage);
 }
 
 } // namespace Internal
diff --git a/src/plugins/baremetal/baremetalruncontrolfactory.h b/src/plugins/baremetal/baremetalruncontrolfactory.h
index ab730c3e5d..7b28127631 100644
--- a/src/plugins/baremetal/baremetalruncontrolfactory.h
+++ b/src/plugins/baremetal/baremetalruncontrolfactory.h
@@ -35,7 +35,6 @@
 
 #include <projectexplorer/runconfiguration.h>
 #include <debugger/debuggerstartparameters.h>
-#include <debugger/debuggerrunner.h>
 
 namespace BareMetal {
 namespace Internal {
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index 7c3b414e3f..edf9a72709 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -33,7 +33,7 @@ HEADERS += \
     debuggerplugin.h \
     debuggerprotocol.h \
     debuggerrunconfigurationaspect.h \
-    debuggerrunner.h \
+    debuggerruncontrol.h \
     debuggerstartparameters.h \
     debuggerstringutils.h \
     debuggerkitconfigwidget.h \
@@ -65,7 +65,6 @@ HEADERS += \
     threaddata.h \
     threadshandler.h \
     watchdelegatewidgets.h \
-    debuggerruncontrolfactory.h \
     debuggertooltipmanager.h \
     debuggersourcepathmappingwidget.h \
     memoryview.h \
@@ -90,7 +89,7 @@ SOURCES += \
     debuggerplugin.cpp \
     debuggerprotocol.cpp \
     debuggerrunconfigurationaspect.cpp \
-    debuggerrunner.cpp \
+    debuggerruncontrol.cpp \
     debuggeroptionspage.cpp \
     debuggerkitconfigwidget.cpp \
     debuggerkitinformation.cpp \
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index eaad739270..69867c4036 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -50,9 +50,8 @@ QtcPlugin {
             "debuggeroptionspage.cpp", "debuggeroptionspage.h",
             "debuggerplugin.cpp", "debuggerplugin.h",
             "debuggerprotocol.cpp", "debuggerprotocol.h",
-            "debuggerruncontrolfactory.h",
             "debuggerrunconfigurationaspect.cpp", "debuggerrunconfigurationaspect.h",
-            "debuggerrunner.cpp", "debuggerrunner.h",
+            "debuggerruncontrol.cpp", "debuggerruncontrol.h",
             "debuggersourcepathmappingwidget.cpp", "debuggersourcepathmappingwidget.h",
             "debuggerstartparameters.h",
             "debuggerstringutils.h",
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index d9aa50c372..1f5a6a66c7 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -33,7 +33,7 @@
 #include "debuggerinternalconstants.h"
 #include "debuggeractions.h"
 #include "debuggercore.h"
-#include "debuggerrunner.h"
+#include "debuggerruncontrol.h"
 #include "debuggerstringutils.h"
 #include "debuggerstartparameters.h"
 #include "debuggertooltipmanager.h"
diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp
index 7d2d7b2c88..cd237bba61 100644
--- a/src/plugins/debugger/debuggeritem.cpp
+++ b/src/plugins/debugger/debuggeritem.cpp
@@ -41,18 +41,23 @@
 #include <QProcess>
 #include <QUuid>
 
+#ifdef WITH_TESTS
+#    include <QTest>
+#    include "debuggerplugin.h"
+#endif
+
 using namespace Debugger::Internal;
 using namespace ProjectExplorer;
 using namespace Utils;
 
-static const char DEBUGGER_INFORMATION_COMMAND[] = "Binary";
-static const char DEBUGGER_INFORMATION_DISPLAYNAME[] = "DisplayName";
-static const char DEBUGGER_INFORMATION_ID[] = "Id";
-static const char DEBUGGER_INFORMATION_ENGINETYPE[] = "EngineType";
-static const char DEBUGGER_INFORMATION_AUTODETECTED[] = "AutoDetected";
-static const char DEBUGGER_INFORMATION_AUTODETECTION_SOURCE[] = "AutoDetectionSource";
-static const char DEBUGGER_INFORMATION_VERSION[] = "Version";
-static const char DEBUGGER_INFORMATION_ABIS[] = "Abis";
+const char DEBUGGER_INFORMATION_COMMAND[] = "Binary";
+const char DEBUGGER_INFORMATION_DISPLAYNAME[] = "DisplayName";
+const char DEBUGGER_INFORMATION_ID[] = "Id";
+const char DEBUGGER_INFORMATION_ENGINETYPE[] = "EngineType";
+const char DEBUGGER_INFORMATION_AUTODETECTED[] = "AutoDetected";
+const char DEBUGGER_INFORMATION_AUTODETECTION_SOURCE[] = "AutoDetectionSource";
+const char DEBUGGER_INFORMATION_VERSION[] = "Version";
+const char DEBUGGER_INFORMATION_ABIS[] = "Abis";
 
 namespace Debugger {
 
@@ -165,13 +170,13 @@ void DebuggerItem::reinitializeFromFile()
 QString DebuggerItem::engineTypeName() const
 {
     switch (m_engineType) {
-    case Debugger::NoEngineType:
+    case NoEngineType:
         return DebuggerOptionsPage::tr("Not recognized");
-    case Debugger::GdbEngineType:
+    case GdbEngineType:
         return QLatin1String("GDB");
-    case Debugger::CdbEngineType:
+    case CdbEngineType:
         return QLatin1String("CDB");
-    case Debugger::LldbEngineType:
+    case LldbEngineType:
         return QLatin1String("LLDB");
     default:
         return QString();
@@ -302,19 +307,16 @@ DebuggerItem::MatchLevel DebuggerItem::matchTarget(const Abi &targetAbi) const
     return bestMatch;
 }
 
-bool Debugger::DebuggerItem::isValid() const
+bool DebuggerItem::isValid() const
 {
     return !m_id.isNull();
 }
 
-} // namespace Debugger;
-
 #ifdef WITH_TESTS
 
-#    include <QTest>
-#    include "debuggerplugin.h"
+namespace Internal {
 
-void Debugger::DebuggerPlugin::testDebuggerMatching_data()
+void DebuggerPlugin::testDebuggerMatching_data()
 {
     QTest::addColumn<QStringList>("debugger");
     QTest::addColumn<QString>("target");
@@ -394,7 +396,7 @@ void Debugger::DebuggerPlugin::testDebuggerMatching_data()
             << int(DebuggerItem::DoesNotMatch);
 }
 
-void Debugger::DebuggerPlugin::testDebuggerMatching()
+void DebuggerPlugin::testDebuggerMatching()
 {
     QFETCH(QStringList, debugger);
     QFETCH(QString, target);
@@ -415,4 +417,9 @@ void Debugger::DebuggerPlugin::testDebuggerMatching()
 
     QCOMPARE(expectedLevel, level);
 }
+
+} // namespace Internal
+
 #endif
+
+} // namespace Debugger;
diff --git a/src/plugins/debugger/debuggeritemmanager.h b/src/plugins/debugger/debuggeritemmanager.h
index 274b070024..1f165dbc1c 100644
--- a/src/plugins/debugger/debuggeritemmanager.h
+++ b/src/plugins/debugger/debuggeritemmanager.h
@@ -43,6 +43,8 @@ namespace Utils { class PersistentSettingsWriter; }
 
 namespace Debugger {
 
+namespace Internal { class DebuggerPlugin; }
+
 // -----------------------------------------------------------------------
 // DebuggerItemManager
 // -----------------------------------------------------------------------
@@ -91,7 +93,7 @@ private:
     static QList<DebuggerItem> m_debuggers;
 
     friend class Internal::DebuggerItemModel;
-    friend class DebuggerPlugin; // Enable constrcutor for DebuggerPlugin
+    friend class Internal::DebuggerPlugin; // Enable constrcutor for DebuggerPlugin
 };
 
 } // namespace Debugger
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index a7b233c15a..cc00f86e78 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -39,9 +39,8 @@
 #include "debuggerengine.h"
 #include "debuggeritemmanager.h"
 #include "debuggermainwindow.h"
-#include "debuggerrunner.h"
 #include "debuggerrunconfigurationaspect.h"
-#include "debuggerruncontrolfactory.h"
+#include "debuggerruncontrol.h"
 #include "debuggerstringutils.h"
 #include "debuggeroptionspage.h"
 #include "debuggerkitinformation.h"
@@ -3482,12 +3481,6 @@ QObject *DebuggerPlugin::remoteCommand(const QStringList &options,
     return 0;
 }
 
-DebuggerRunControl *DebuggerPlugin::createDebugger
-    (const DebuggerStartParameters &sp, RunConfiguration *rc, QString *errorMessage)
-{
-    return DebuggerRunControlFactory::doCreate(sp, rc, errorMessage);
-}
-
 void DebuggerPlugin::extensionsInitialized()
 {
     theDebuggerCore->extensionsInitialized();
diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index 2ca7a59644..ae1b41175b 100644
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -32,23 +32,12 @@
 #define DEBUGGERPLUGIN_H
 
 #include "debugger_global.h"
-
 #include <extensionsystem/iplugin.h>
 
-QT_FORWARD_DECLARE_CLASS(QAction)
-
-namespace ProjectExplorer {
-class RunConfiguration;
-class RunControl;
-}
-
 namespace Debugger {
+namespace Internal {
 
-class DebuggerMainWindow;
-class DebuggerRunControl;
-class DebuggerStartParameters;
-
-class DEBUGGER_EXPORT DebuggerPlugin : public ExtensionSystem::IPlugin
+class DebuggerPlugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Debugger.json")
@@ -57,10 +46,6 @@ public:
     DebuggerPlugin();
     ~DebuggerPlugin();
 
-    static DebuggerRunControl *createDebugger(const DebuggerStartParameters &sp,
-                                              ProjectExplorer::RunConfiguration *rc,
-                                              QString *errorMessage);
-
 private:
     // IPlugin implementation.
     bool initialize(const QStringList &arguments, QString *errorMessage);
@@ -78,6 +63,7 @@ private slots:
 #endif
 };
 
+} // namespace Internal
 } // namespace Debugger
 
 #endif // DEBUGGERPLUGIN_H
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 74816da543..7917b6dc2a 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -28,8 +28,7 @@
 **
 ****************************************************************************/
 
-#include "debuggerrunner.h"
-#include "debuggerruncontrolfactory.h"
+#include "debuggerruncontrol.h"
 
 #include "debuggeractions.h"
 #include "debuggercore.h"
diff --git a/src/plugins/debugger/debuggerruncontrolfactory.h b/src/plugins/debugger/debuggerruncontrol.h
index 47eed9ea6c..5ff9f0e0b1 100644
--- a/src/plugins/debugger/debuggerruncontrolfactory.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -28,9 +28,10 @@
 **
 ****************************************************************************/
 
-#ifndef DEBUGGERRUNCONTROLFACTORY_H
-#define DEBUGGERRUNCONTROLFACTORY_H
+#ifndef DEBUGGERRUNCONTROL_H
+#define DEBUGGERRUNCONTROL_H
 
+#include "debugger_global.h"
 #include "debuggerconstants.h"
 
 #include <projectexplorer/runconfiguration.h>
@@ -38,12 +39,42 @@
 namespace Debugger {
 
 class DebuggerEngine;
-class DebuggerRunControl;
 class DebuggerStartParameters;
 
-namespace Internal {
+class DEBUGGER_EXPORT DebuggerRunControl
+    : public ProjectExplorer::RunControl
+{
+    Q_OBJECT
+
+public:
+    ~DebuggerRunControl();
+
+    // ProjectExplorer::RunControl
+    void start();
+    bool promptToStop(bool *prompt = 0) const;
+    StopResult stop(); // Called from SnapshotWindow.
+    bool isRunning() const;
+    QString displayName() const;
+
+    void startFailed();
+    void debuggingFinished();
+    DebuggerEngine *engine();
+
+signals:
+    void engineRequestSetup();
+
+private slots:
+    void handleFinished();
+
+private:
+    friend class DebuggerRunControlFactory;
+    DebuggerRunControl(ProjectExplorer::RunConfiguration *runConfiguration, DebuggerEngine *engine);
+
+    DebuggerEngine *m_engine;
+    bool m_running;
+};
 
-class DebuggerRunControlFactory
+class DEBUGGER_EXPORT DebuggerRunControlFactory
     : public ProjectExplorer::IRunControlFactory
 {
 public:
@@ -71,7 +102,6 @@ public:
             ProjectExplorer::RunConfiguration *rc);
 };
 
-} // namespace Internal
 } // namespace Debugger
 
-#endif // DEBUGGERRUNCONTROLFACTORY_H
+#endif // DEBUGGERRUNCONTROL_H
diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h
deleted file mode 100644
index ce164f6cae..0000000000
--- a/src/plugins/debugger/debuggerrunner.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://www.qt.io/licensing.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef DEBUGGERRUNNER_H
-#define DEBUGGERRUNNER_H
-
-#include "debugger_global.h"
-
-#include <projectexplorer/runconfiguration.h>
-
-namespace Debugger {
-class DebuggerEngine;
-class DebuggerRunControl;
-
-namespace Internal { class DebuggerRunControlFactory; }
-
-class DEBUGGER_EXPORT DebuggerRunControl
-    : public ProjectExplorer::RunControl
-{
-    Q_OBJECT
-
-public:
-    ~DebuggerRunControl();
-
-    // ProjectExplorer::RunControl
-    void start();
-    bool promptToStop(bool *prompt = 0) const;
-    StopResult stop(); // Called from SnapshotWindow.
-    bool isRunning() const;
-    QString displayName() const;
-
-    void startFailed();
-    void debuggingFinished();
-    DebuggerEngine *engine();
-
-signals:
-    void engineRequestSetup();
-
-private slots:
-    void handleFinished();
-
-private:
-    friend class Internal::DebuggerRunControlFactory;
-    DebuggerRunControl(ProjectExplorer::RunConfiguration *runConfiguration, DebuggerEngine *engine);
-
-    DebuggerEngine *m_engine;
-    bool m_running;
-};
-
-} // namespace Debugger
-
-#endif // DEBUGGERRUNNER_H
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 104e593b5a..daebe23d04 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -39,7 +39,7 @@
 
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerinternalconstants.h>
-#include <debugger/debuggerruncontrolfactory.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/disassemblerlines.h>
 
 #include <debugger/debuggeractions.h>
diff --git a/src/plugins/debugger/gdb/startgdbserverdialog.cpp b/src/plugins/debugger/gdb/startgdbserverdialog.cpp
index b3aa96cec9..2ddc0efb37 100644
--- a/src/plugins/debugger/gdb/startgdbserverdialog.cpp
+++ b/src/plugins/debugger/gdb/startgdbserverdialog.cpp
@@ -33,7 +33,7 @@
 #include <debugger/debuggermainwindow.h>
 #include <debugger/debuggerplugin.h>
 #include <debugger/debuggerkitinformation.h>
-#include <debugger/debuggerruncontrolfactory.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerstartparameters.h>
 
 #include <coreplugin/icore.h>
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 55266c6d84..94354d746c 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -35,7 +35,6 @@
 #include <debugger/debuggerdialogs.h>
 #include <debugger/debuggerinternalconstants.h>
 #include <debugger/debuggermainwindow.h>
-#include <debugger/debuggerplugin.h>
 #include <debugger/debuggerprotocol.h>
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerstringutils.h>
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 393ce0a315..fc7dd57624 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -30,7 +30,7 @@
 
 #include "qmlcppengine.h"
 #include "qmlengine.h"
-#include <debugger/debuggerruncontrolfactory.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/stackhandler.h>
 #include <debugger/watchhandler.h>
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 48117a39e3..7559a3c05c 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -32,12 +32,12 @@
 #include "baseqmldebuggerclient.h"
 #include "qmlinspectoragent.h"
 
-#include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggeractions.h>
 #include <debugger/debuggercore.h>
 #include <debugger/debuggerinternalconstants.h>
 #include <debugger/debuggermainwindow.h>
-#include <debugger/debuggerrunner.h>
+#include <debugger/debuggerruncontrol.h>
+#include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerstringutils.h>
 #include <debugger/debuggertooltipmanager.h>
 #include <debugger/localsandexpressionswindow.h>
@@ -47,6 +47,7 @@
 #include <debugger/stackhandler.h>
 #include <debugger/watchhandler.h>
 #include <debugger/sourcefileshandler.h>
+
 #include <qmljseditor/qmljseditorconstants.h>
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
@@ -62,12 +63,10 @@
 
 #include <QDebug>
 #include <QDir>
-
+#include <QDockWidget>
 #include <QMessageBox>
 #include <QPlainTextEdit>
 
-#include <QDockWidget>
-
 #define DEBUG_QML 1
 #if DEBUG_QML
 #   define SDEBUG(s) qDebug() << s
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 89b22c82d4..442a3ea554 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -385,7 +385,6 @@ private slots:
     void updateVimRcWidgets();
 
 private:
-    friend class DebuggerPlugin;
     QPointer<QWidget> m_widget;
     Ui::FakeVimOptionPage m_ui;
     Utils::SavedActionSet m_group;
diff --git a/src/plugins/ios/iosanalyzesupport.cpp b/src/plugins/ios/iosanalyzesupport.cpp
index 7b88ccb17f..e37b1dccc2 100644
--- a/src/plugins/ios/iosanalyzesupport.cpp
+++ b/src/plugins/ios/iosanalyzesupport.cpp
@@ -37,7 +37,7 @@
 #include <debugger/debuggerengine.h>
 #include <debugger/debuggerplugin.h>
 #include <debugger/debuggerkitinformation.h>
-#include <debugger/debuggerrunner.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerrunconfigurationaspect.h>
 #include <projectexplorer/toolchain.h>
diff --git a/src/plugins/ios/iosdebugsupport.cpp b/src/plugins/ios/iosdebugsupport.cpp
index c4024df523..e8bed4554a 100644
--- a/src/plugins/ios/iosdebugsupport.cpp
+++ b/src/plugins/ios/iosdebugsupport.cpp
@@ -37,7 +37,7 @@
 #include <debugger/debuggerengine.h>
 #include <debugger/debuggerplugin.h>
 #include <debugger/debuggerkitinformation.h>
-#include <debugger/debuggerrunner.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerrunconfigurationaspect.h>
 #include <projectexplorer/toolchain.h>
@@ -171,7 +171,7 @@ RunControl *IosDebugSupport::createDebugRunControl(IosRunConfiguration *runConfi
     }
 
     DebuggerRunControl * const debuggerRunControl
-        = DebuggerPlugin::createDebugger(params, runConfig, errorMessage);
+        = DebuggerRunControlFactory::doCreate(params, runConfig, errorMessage);
     if (debuggerRunControl)
         new IosDebugSupport(runConfig, debuggerRunControl, cppDebug, qmlDebug);
     return debuggerRunControl;
diff --git a/src/plugins/qnx/blackberrydebugsupport.cpp b/src/plugins/qnx/blackberrydebugsupport.cpp
index 77b8499705..13c558e393 100644
--- a/src/plugins/qnx/blackberrydebugsupport.cpp
+++ b/src/plugins/qnx/blackberrydebugsupport.cpp
@@ -33,7 +33,7 @@
 #include "blackberrydebugsupport.h"
 #include "blackberryapplicationrunner.h"
 
-#include <debugger/debuggerrunner.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerengine.h>
 #include <debugger/debuggerstartparameters.h>
 
diff --git a/src/plugins/qnx/blackberryruncontrolfactory.cpp b/src/plugins/qnx/blackberryruncontrolfactory.cpp
index 9a1b135528..02ca9e0e2e 100644
--- a/src/plugins/qnx/blackberryruncontrolfactory.cpp
+++ b/src/plugins/qnx/blackberryruncontrolfactory.cpp
@@ -42,7 +42,7 @@
 
 #include <debugger/debuggerplugin.h>
 #include <debugger/debuggerrunconfigurationaspect.h>
-#include <debugger/debuggerrunner.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerkitinformation.h>
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/project.h>
@@ -161,7 +161,7 @@ ProjectExplorer::RunControl *BlackBerryRunControlFactory::create(ProjectExplorer
         return runControl;
     }
     Debugger::DebuggerRunControl * const runControl =
-            Debugger::DebuggerPlugin::createDebugger(startParameters(rc), runConfiguration, errorMessage);
+            Debugger::DebuggerRunControlFactory::doCreate(startParameters(rc), runConfiguration, errorMessage);
     if (!runControl)
         return 0;
 
diff --git a/src/plugins/qnx/qnxattachdebugsupport.cpp b/src/plugins/qnx/qnxattachdebugsupport.cpp
index 1d93fbe411..8d41950f4a 100644
--- a/src/plugins/qnx/qnxattachdebugsupport.cpp
+++ b/src/plugins/qnx/qnxattachdebugsupport.cpp
@@ -37,8 +37,7 @@
 
 #include <debugger/debuggerengine.h>
 #include <debugger/debuggerkitinformation.h>
-#include <debugger/debuggerplugin.h>
-#include <debugger/debuggerrunner.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerstartparameters.h>
 #include <projectexplorer/devicesupport/deviceapplicationrunner.h>
 #include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
@@ -134,7 +133,7 @@ void QnxAttachDebugSupport::attachToProcess()
         sp.solibSearchPath = QnxUtils::searchPaths(qtVersion);
 
     QString errorMessage;
-    Debugger::DebuggerRunControl * const runControl = Debugger::DebuggerPlugin::createDebugger(sp, 0, &errorMessage);
+    Debugger::DebuggerRunControl * const runControl = Debugger::DebuggerRunControlFactory::doCreate(sp, 0, &errorMessage);
     if (!errorMessage.isEmpty()) {
         handleError(errorMessage);
         stopPDebug();
diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp
index cdf9622e9b..f4836276ee 100644
--- a/src/plugins/qnx/qnxdebugsupport.cpp
+++ b/src/plugins/qnx/qnxdebugsupport.cpp
@@ -38,7 +38,7 @@
 
 #include <debugger/debuggerengine.h>
 #include <debugger/debuggerrunconfigurationaspect.h>
-#include <debugger/debuggerrunner.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerstartparameters.h>
 #include <projectexplorer/devicesupport/deviceapplicationrunner.h>
 #include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
diff --git a/src/plugins/qnx/qnxruncontrolfactory.cpp b/src/plugins/qnx/qnxruncontrolfactory.cpp
index 84a20e5ff3..b13722d27b 100644
--- a/src/plugins/qnx/qnxruncontrolfactory.cpp
+++ b/src/plugins/qnx/qnxruncontrolfactory.cpp
@@ -41,8 +41,7 @@
 #include "qnxdeviceconfiguration.h"
 
 #include <debugger/debuggerengine.h>
-#include <debugger/debuggerplugin.h>
-#include <debugger/debuggerrunner.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerrunconfigurationaspect.h>
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerkitinformation.h>
@@ -181,7 +180,7 @@ RunControl *QnxRunControlFactory::create(RunConfiguration *runConfig, RunMode mo
         return new QnxRunControl(rc);
     case DebugRunMode: {
         const DebuggerStartParameters params = createDebuggerStartParameters(rc);
-        DebuggerRunControl * const runControl = DebuggerPlugin::createDebugger(params, rc, errorMessage);
+        DebuggerRunControl * const runControl = DebuggerRunControlFactory::doCreate(params, rc, errorMessage);
         if (!runControl)
             return 0;
 
diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
index 2a77299edd..153ffcc05c 100644
--- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
@@ -36,8 +36,7 @@
 #include "remotelinuxrunconfiguration.h"
 #include "remotelinuxruncontrol.h"
 
-#include <debugger/debuggerplugin.h>
-#include <debugger/debuggerrunner.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerstartparameters.h>
 #include <analyzerbase/analyzerstartparameters.h>
 #include <analyzerbase/analyzermanager.h>
@@ -108,7 +107,7 @@ RunControl *RemoteLinuxRunControlFactory::create(RunConfiguration *runConfig, Ru
         if (mode == ProjectExplorer::DebugRunModeWithBreakOnMain)
             params.breakOnMain = true;
         DebuggerRunControl * const runControl
-                = DebuggerPlugin::createDebugger(params, rc, errorMessage);
+                = DebuggerRunControlFactory::doCreate(params, rc, errorMessage);
         if (!runControl)
             return 0;
         LinuxDeviceDebugSupport * const debugSupport =
diff --git a/src/plugins/winrt/winrtdebugsupport.cpp b/src/plugins/winrt/winrtdebugsupport.cpp
index 463e0dbac6..e3c9d785b1 100644
--- a/src/plugins/winrt/winrtdebugsupport.cpp
+++ b/src/plugins/winrt/winrtdebugsupport.cpp
@@ -34,8 +34,7 @@
 
 #include <debugger/debuggerengine.h>
 #include <debugger/debuggerkitinformation.h>
-#include <debugger/debuggerplugin.h>
-#include <debugger/debuggerrunner.h>
+#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerstartparameters.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
@@ -122,7 +121,7 @@ RunControl *WinRtDebugSupport::createDebugRunControl(WinRtRunConfiguration *runC
                 }
                 server.close();
                 Debugger::DebuggerRunControl *debugRunControl
-                        = DebuggerPlugin::createDebugger(params, runConfig, errorMessage);
+                        = DebuggerRunControlFactory::doCreate(params, runConfig, errorMessage);
                 runner->setRunControl(debugRunControl);
                 new WinRtDebugSupport(debugRunControl, runner);
                 return debugRunControl;