From 91dd6ee0f929c9e4146bb17b225b94ff59e85474 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Fri, 7 Jul 2017 09:23:26 +0300
Subject: [PATCH 01/41] Debugger: Fix crash when shutting down during core
 initialization

GDB output is still processed, but the docks are already deleted.

Use asynchronous shutdown, and wait for engine termination before deleting
the main window.

Change-Id: I28a36de15a0e9ce08ae18412d97aaf13cb0c25a6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/debugger/debuggerplugin.cpp | 39 +++++++++++++++----------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index dcc07a6d87d..6f8985f711f 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -637,6 +637,7 @@ public:
     bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
     void aboutToShutdown();
+    void doShutdown();
 
     void connectEngine(DebuggerRunTool *runTool);
     void disconnectEngine() { connectEngine(0); }
@@ -763,8 +764,6 @@ public:
     void aboutToUnloadSession();
     void aboutToSaveSession();
 
-    void coreShutdown();
-
 public:
     void updateDebugActions();
 
@@ -1050,6 +1049,7 @@ public:
     DebuggerPlugin *m_plugin = 0;
 
     SnapshotHandler *m_snapshotHandler = 0;
+    QTimer m_shutdownTimer;
     bool m_shuttingDown = false;
     QPointer<DebuggerEngine> m_previouslyActiveEngine;
     QPointer<DebuggerRunTool> m_currentRunTool;
@@ -1319,8 +1319,6 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
     m_debuggerSettings = new DebuggerSettings;
     m_debuggerSettings->readSettings();
 
-    connect(ICore::instance(), &ICore::coreAboutToClose, this, &DebuggerPluginPrivate::coreShutdown);
-
     const Context cppDebuggercontext(C_CPPDEBUGGER);
     const Context qmljsDebuggercontext(C_QMLDEBUGGER);
 
@@ -2796,13 +2794,23 @@ void DebuggerPluginPrivate::showStatusMessage(const QString &msg0, int timeout)
     m_mainWindow->showStatusMessage(msg, timeout);
 }
 
-void DebuggerPluginPrivate::coreShutdown()
+void DebuggerPluginPrivate::aboutToShutdown()
 {
     m_shuttingDown = true;
-    if (currentEngine()) {
-        if (currentEngine()->state() != Debugger::DebuggerNotReady)
-            currentEngine()->abortDebugger();
+
+    disconnect(SessionManager::instance(), &SessionManager::startupProjectChanged, this, nullptr);
+
+    m_mainWindow->saveCurrentPerspective();
+    m_shutdownTimer.setInterval(0);
+    m_shutdownTimer.setSingleShot(true);
+    connect(&m_shutdownTimer, &QTimer::timeout, this, &DebuggerPluginPrivate::doShutdown);
+    if (DebuggerEngine *engine = currentEngine()) {
+        if (engine->state() != Debugger::DebuggerNotReady) {
+            engine->abortDebugger();
+            m_shutdownTimer.setInterval(3000);
+        }
     }
+    m_shutdownTimer.start();
 }
 
 const CPlusPlus::Snapshot &cppCodeModelSnapshot()
@@ -2938,11 +2946,13 @@ void DebuggerPluginPrivate::runControlFinished(DebuggerRunTool *runTool)
 {
     if (runTool && runTool->engine())
         runTool->engine()->handleFinished();
-    if (m_shuttingDown)
-        return;
     showStatusMessage(tr("Debugger finished."));
     m_snapshotHandler->removeSnapshot(runTool);
     if (m_snapshotHandler->size() == 0) {
+        if (m_shuttingDown) {
+            doShutdown();
+            return;
+        }
         // Last engine quits.
         disconnectEngine();
         if (boolSetting(SwitchModeOnExit))
@@ -3120,11 +3130,9 @@ void showModuleSections(const QString &moduleName, const Sections &sections)
     createNewDock(w);
 }
 
-void DebuggerPluginPrivate::aboutToShutdown()
+void DebuggerPluginPrivate::doShutdown()
 {
-    disconnect(SessionManager::instance(), &SessionManager::startupProjectChanged, this, nullptr);
-
-    m_mainWindow->saveCurrentPerspective();
+    m_shutdownTimer.stop();
     delete m_mainWindow;
     m_mainWindow = 0;
 
@@ -3140,6 +3148,7 @@ void DebuggerPluginPrivate::aboutToShutdown()
 
     delete m_mode;
     m_mode = 0;
+    emit m_plugin->asynchronousShutdownFinished();
 }
 
 void updateState(DebuggerRunTool *runTool)
@@ -3302,7 +3311,7 @@ IPlugin::ShutdownFlag DebuggerPlugin::aboutToShutdown()
 {
     removeObject(this);
     dd->aboutToShutdown();
-    return SynchronousShutdown;
+    return AsynchronousShutdown;
 }
 
 QObject *DebuggerPlugin::remoteCommand(const QStringList &options,

From 295d3d717075ed1a0dab3521f099f06ebfd0ebe0 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 19 Sep 2017 17:51:53 +0200
Subject: [PATCH 02/41] Debugger: Avoid use of dummy RunConfigurations

Allow to rely on kit plus data directly specified in the dialogs.

This means, RunControls with nullptr RunConfigurations are allowed
again.

Change-Id: I0b574b397603c0520c8187a8967bff2cf5e20ae8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/debuggerdialogs.cpp      |  4 +-
 src/plugins/debugger/debuggerplugin.cpp       | 42 +++++++--------
 src/plugins/debugger/debuggerruncontrol.cpp   | 52 ++-----------------
 src/plugins/debugger/debuggerruncontrol.h     |  7 +--
 src/plugins/debugger/gdb/gdbengine.cpp        |  5 +-
 .../debugger/gdb/startgdbserverdialog.cpp     |  5 +-
 6 files changed, 32 insertions(+), 83 deletions(-)

diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 8668243ab46..3a17544ab6c 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -406,8 +406,8 @@ void StartApplicationDialog::run(bool attachRemote)
     Kit *k = dialog.d->kitChooser->currentKit();
     IDevice::ConstPtr dev = DeviceKitInformation::device(k);
 
-    DebuggerRunTool *debugger = DebuggerRunTool::createFromKit(k);
-    QTC_ASSERT(debugger, return);
+    auto runControl = new RunControl(nullptr, ProjectExplorer::Constants::DEBUG_RUN_MODE);
+    auto debugger = new DebuggerRunTool(runControl, k);
 
     const StartApplicationParameters newParameters = dialog.parameters();
     if (newParameters != history.back()) {
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 6f8985f711f..5637e4b18e6 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1178,9 +1178,8 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
         if (!kit)
             kit = guessKitFromAbis(Abi::abisOfBinary(FileName::fromString(executable)));
 
-        auto debugger = DebuggerRunTool::createFromKit(kit);
-        QTC_ASSERT(debugger, return false);
-
+        auto runControl = new RunControl(nullptr, ProjectExplorer::Constants::DEBUG_RUN_MODE);
+        auto debugger = new DebuggerRunTool(runControl, kit);
         if (pid) {
             debugger->setStartMode(AttachExternal);
             debugger->setCloseMode(DetachAtClose);
@@ -1221,8 +1220,8 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
             return false;
         }
         qint64 pid = it->section(':', 1, 1).toULongLong();
-        auto debugger = DebuggerRunTool::createFromKit(findUniversalCdbKit());
-        QTC_ASSERT(debugger, return false);
+        auto runControl = new RunControl(nullptr, ProjectExplorer::Constants::DEBUG_RUN_MODE);
+        auto debugger = new DebuggerRunTool(runControl, findUniversalCdbKit());
         debugger->setStartMode(AttachCrashedExternal);
         debugger->setCrashParameter(it->section(':', 0, 0));
         debugger->setAttachPid(pid);
@@ -1958,9 +1957,8 @@ void DebuggerPluginPrivate::attachCore()
     setConfigValue("LastExternalStartScript", dlg.overrideStartScript());
     setConfigValue("LastForceLocalCoreFile", dlg.forcesLocalCoreFile());
 
-    auto debugger = DebuggerRunTool::createFromKit(dlg.kit());
-    QTC_ASSERT(debugger, return);
-    debugger->setMasterEngineType(DebuggerKitInformation::engineType(dlg.kit()));
+    auto runControl = new RunControl(nullptr, ProjectExplorer::Constants::DEBUG_RUN_MODE);
+    auto debugger = new DebuggerRunTool(runControl, dlg.kit());
     debugger->setInferiorExecutable(dlg.localExecutableFile());
     debugger->setCoreFileName(dlg.localCoreFile());
     debugger->setRunControlName(tr("Core file \"%1\"")
@@ -1986,8 +1984,8 @@ void DebuggerPluginPrivate::startRemoteCdbSession()
         return;
     setConfigValue(connectionKey, dlg.connection());
 
-    auto debugger = DebuggerRunTool::createFromKit(kit);
-    QTC_ASSERT(debugger, return);
+    auto runControl = new RunControl(nullptr, ProjectExplorer::Constants::DEBUG_RUN_MODE);
+    auto debugger = new DebuggerRunTool(runControl, kit);
     debugger->setStartMode(AttachToRemoteServer);
     debugger->setCloseMode(KillAtClose);
     debugger->setRemoteChannel(dlg.connection());
@@ -2088,8 +2086,8 @@ RunControl *DebuggerPluginPrivate::attachToRunningProcess(Kit *kit,
         return 0;
     }
 
-    auto debugger = DebuggerRunTool::createFromKit(kit);
-    QTC_ASSERT(debugger, return nullptr);
+    auto runControl = new RunControl(nullptr, ProjectExplorer::Constants::DEBUG_RUN_MODE);
+    auto debugger = new DebuggerRunTool(runControl, kit);
     debugger->setAttachPid(ProcessHandle(process.pid));
     debugger->setRunControlName(tr("Process %1").arg(process.pid));
     debugger->setInferiorExecutable(process.exe);
@@ -2104,20 +2102,14 @@ RunControl *DebuggerPluginPrivate::attachToRunningProcess(Kit *kit,
 
 void DebuggerPlugin::attachExternalApplication(RunControl *rc)
 {
-    DebuggerRunTool *debugger;
-    if (RunConfiguration *runConfig = rc->runConfiguration()) {
-        debugger = DebuggerRunTool::createFromRunConfiguration(runConfig);
-    } else {
-        Kit *kit = guessKitFromAbis({rc->abi()});
-        debugger = DebuggerRunTool::createFromKit(kit);
-    }
-    QTC_ASSERT(debugger, return);
     ProcessHandle pid = rc->applicationProcessHandle();
+    RunConfiguration *runConfig = rc->runConfiguration();
+    auto runControl = new RunControl(runConfig, ProjectExplorer::Constants::DEBUG_RUN_MODE);
+    auto debugger = new DebuggerRunTool(runControl, guessKitFromAbis({rc->abi()}));
     debugger->setAttachPid(pid);
     debugger->setRunControlName(tr("Process %1").arg(pid.pid()));
     debugger->setStartMode(AttachExternal);
     debugger->setCloseMode(DetachAtClose);
-    debugger->setToolChainAbi(rc->abi());
     debugger->startRunControl();
 }
 
@@ -2169,8 +2161,8 @@ void DebuggerPluginPrivate::attachToQmlPort()
     IDevice::ConstPtr device = DeviceKitInformation::device(kit);
     QTC_ASSERT(device, return);
 
-    auto debugger = DebuggerRunTool::createFromKit(kit);
-    QTC_ASSERT(debugger, return);
+    auto runControl = new RunControl(nullptr, ProjectExplorer::Constants::DEBUG_RUN_MODE);
+    auto debugger = new DebuggerRunTool(runControl, kit);
 
     QUrl qmlServer = device->toolControlChannel(IDevice::QmlControlChannel);
     qmlServer.setPort(dlg.port());
@@ -3657,7 +3649,9 @@ void DebuggerUnitTests::testStateMachine()
     RunConfiguration *rc = t->activeRunConfiguration();
     QVERIFY(rc);
 
-    auto debugger = DebuggerRunTool::createFromRunConfiguration(rc);
+    auto runControl = new RunControl(rc, ProjectExplorer::Constants::DEBUG_RUN_MODE);
+    auto debugger = new DebuggerRunTool(runControl);
+
     debugger->setInferior(rc->runnable().as<StandardRunnable>());
     debugger->setTestCase(TestNoBoundsOfCurrentFunction);
 
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index eeff836bc2f..e6832afe9aa 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -339,11 +339,6 @@ void DebuggerRunTool::setOverrideStartScript(const QString &script)
     m_runParameters.overrideStartScript = script;
 }
 
-void DebuggerRunTool::setToolChainAbi(const Abi &abi)
-{
-    m_runParameters.toolChainAbi = abi;
-}
-
 void DebuggerRunTool::setInferior(const Runnable &runnable)
 {
     QTC_ASSERT(runnable.is<StandardRunnable>(), reportFailure(); return);
@@ -397,11 +392,6 @@ void DebuggerRunTool::addQmlServerInferiorCommandLineArgumentIfNeeded()
     }
 }
 
-void DebuggerRunTool::setMasterEngineType(DebuggerEngineType engineType)
-{
-    m_runParameters.masterEngineType = engineType;
-}
-
 void DebuggerRunTool::setCrashParameter(const QString &event)
 {
     m_runParameters.crashParameter = event;
@@ -737,7 +727,7 @@ bool DebuggerRunTool::fixupParameters()
     return true;
 }
 
-DebuggerRunTool::DebuggerRunTool(RunControl *runControl)
+DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit)
     : RunWorker(runControl)
 {
     setDisplayName("DebuggerRunTool");
@@ -773,7 +763,8 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl)
     if (runConfig)
         m_runParameters.displayName = runConfig->displayName();
 
-    const Kit *kit = runConfig->target()->kit();
+    if (runConfig && !kit)
+        kit = runConfig->target()->kit();
     QTC_ASSERT(kit, return);
 
     m_runParameters.macroExpander = kit->macroExpander();
@@ -807,7 +798,7 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl)
             m_runParameters.validationErrors.append(t.description);
     }
 
-    if (runConfig->property("supportsDebugger").toBool()) {
+    if (runConfig && runConfig->property("supportsDebugger").toBool()) {
         const QString mainScript = runConfig->property("mainScript").toString();
         const QString interpreter = runConfig->property("interpreter").toString();
         if (!interpreter.isEmpty() && mainScript.endsWith(".py")) {
@@ -819,6 +810,7 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl)
                     m_runParameters.inferior.commandLineArguments.append(' ');
                 m_runParameters.inferior.commandLineArguments.append(args);
             }
+            m_runParameters.cppEngineType = PdbEngineType;
             m_runParameters.masterEngineType = PdbEngineType;
         }
     }
@@ -829,45 +821,11 @@ DebuggerEngine *DebuggerRunTool::activeEngine() const
     return m_engine ? m_engine->activeEngine() : nullptr;
 }
 
-class DummyProject : public Project
-{
-public:
-    DummyProject() : Project(QString(""), FileName::fromString("")) {}
-};
-
-RunConfiguration *dummyRunConfigForKit(ProjectExplorer::Kit *kit)
-{
-    QTC_ASSERT(kit, return nullptr); // Caller needs to look for a suitable kit.
-    Project *project = SessionManager::startupProject();
-    Target *target = project ? project->target(kit) : nullptr;
-    if (!target || !target->activeRunConfiguration()) {
-        project = new DummyProject; // FIXME: Leaks.
-        target = project->createTarget(kit);
-    }
-    QTC_ASSERT(target, return nullptr);
-    auto runConfig = target->activeRunConfiguration();
-    return runConfig;
-}
-
-DebuggerRunTool *DebuggerRunTool::createFromKit(Kit *kit)
-{
-    RunConfiguration *runConfig = dummyRunConfigForKit(kit);
-    return createFromRunConfiguration(runConfig);
-}
-
 void DebuggerRunTool::startRunControl()
 {
     ProjectExplorerPlugin::startRunControl(runControl());
 }
 
-DebuggerRunTool *DebuggerRunTool::createFromRunConfiguration(RunConfiguration *runConfig)
-{
-    QTC_ASSERT(runConfig, return nullptr);
-    auto runControl = new RunControl(runConfig, ProjectExplorer::Constants::DEBUG_RUN_MODE);
-    auto debugger = new DebuggerRunTool(runControl);
-    return debugger;
-}
-
 void DebuggerRunTool::addSolibSearchDir(const QString &str)
 {
     QString path = str;
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index ff46db5059f..b766a6d023d 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -42,14 +42,13 @@ class DEBUGGER_EXPORT DebuggerRunTool : public ProjectExplorer::RunWorker
     Q_OBJECT
 
 public:
-    explicit DebuggerRunTool(ProjectExplorer::RunControl *runControl);
+    explicit DebuggerRunTool(ProjectExplorer::RunControl *runControl,
+                             ProjectExplorer::Kit *kit = nullptr);
     ~DebuggerRunTool();
 
     Internal::DebuggerEngine *engine() const { return m_engine; }
     Internal::DebuggerEngine *activeEngine() const;
 
-    static DebuggerRunTool *createFromRunConfiguration(ProjectExplorer::RunConfiguration *runConfig);
-    static DebuggerRunTool *createFromKit(ProjectExplorer::Kit *kit); // Avoid, it's guessing.
     void startRunControl();
 
     void showMessage(const QString &msg, int channel = LogDebug, int timeout = -1);
@@ -87,7 +86,6 @@ public:
     void prependInferiorCommandLineArgument(const QString &arg);
     void addQmlServerInferiorCommandLineArgumentIfNeeded();
 
-    void setMasterEngineType(DebuggerEngineType engineType);
     void setCrashParameter(const QString &event);
 
     void addExpectedSignal(const QString &signal);
@@ -129,7 +127,6 @@ public:
     void setNeedFixup(bool) {} // FIXME: Remove after use in QtAppMan is gone.
     void setTestCase(int testCase);
     void setOverrideStartScript(const QString &script);
-    void setToolChainAbi(const ProjectExplorer::Abi &abi);
 
 signals:
     void aboutToNotifyInferiorSetupOk();
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index ece1d1c87c4..89f57b6d559 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3293,8 +3293,9 @@ void GdbEngine::handleMakeSnapshot(const DebuggerResponse &response, const QStri
             const StackFrame &frame = frames.at(0);
             function = frame.function + ":" + QString::number(frame.line);
         }
-        auto debugger = DebuggerRunTool::createFromRunConfiguration(runControl()->runConfiguration());
-        QTC_ASSERT(debugger, return);
+        QTC_ASSERT(runControl()->runConfiguration(), return);
+        auto rc = new RunControl(runControl()->runConfiguration(), ProjectExplorer::Constants::DEBUG_RUN_MODE);
+        auto debugger = new DebuggerRunTool(rc);
         debugger->setStartMode(AttachCore);
         debugger->setRunControlName(function + ": " + QDateTime::currentDateTime().toString());
         debugger->setCoreFileName(coreFile, true);
diff --git a/src/plugins/debugger/gdb/startgdbserverdialog.cpp b/src/plugins/debugger/gdb/startgdbserverdialog.cpp
index 7a0c8c65e3f..a9596269ca5 100644
--- a/src/plugins/debugger/gdb/startgdbserverdialog.cpp
+++ b/src/plugins/debugger/gdb/startgdbserverdialog.cpp
@@ -209,9 +209,8 @@ void GdbServerStarter::attach(int port)
 
     QString remoteChannel = QString("%1:%2").arg(d->device->sshParameters().host).arg(port);
 
-    auto debugger = DebuggerRunTool::createFromKit(d->kit);
-    QTC_ASSERT(debugger, return);
-    debugger->setMasterEngineType(GdbEngineType);
+    auto runControl = new RunControl(nullptr, ProjectExplorer::Constants::DEBUG_RUN_MODE);
+    auto debugger = new DebuggerRunTool(runControl, d->kit);
     debugger->setRemoteChannel(remoteChannel);
     debugger->setRunControlName(tr("Remote: \"%1\"").arg(remoteChannel));
     debugger->setInferiorExecutable(localExecutable);

From cd4218f85adb41bebb115268808d20053523e349 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Tue, 26 Sep 2017 07:11:46 +0200
Subject: [PATCH 03/41] QmlDesigner: Fix compile for gcc 4.9

Change-Id: I7ec825c7c719d46524358d45bec3a93072112cac
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 .../qmldesigner/designercore/model/qmltimelinemutator.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/model/qmltimelinemutator.cpp b/src/plugins/qmldesigner/designercore/model/qmltimelinemutator.cpp
index 7e22a615650..48fb954a2ed 100644
--- a/src/plugins/qmldesigner/designercore/model/qmltimelinemutator.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmltimelinemutator.cpp
@@ -142,10 +142,10 @@ void QmlTimelineMutator::addFramesIfNotExists(const ModelNode &node, const Prope
 
 bool QmlTimelineMutator::hasFrames(const ModelNode &node, const PropertyName &propertyName) const
 {
-    for (const QmlTimelineFrames &frames : frames()) {
-        if (frames.target().isValid()
-                && frames.target() == node
-                && frames.propertyName() == propertyName)
+    for (const QmlTimelineFrames &tFrames : frames()) {
+        if (tFrames.target().isValid()
+                && tFrames.target() == node
+                && tFrames.propertyName() == propertyName)
             return true;
     }
 

From 3f4a434dea5f11890dcf47616b2ee4c70da2901a Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Mon, 25 Sep 2017 15:42:56 +0200
Subject: [PATCH 04/41] ResourceEditor: Clean forward declaration

Change-Id: I4bdf81b30b4b9c04f53ea2d11e56eec94821a15b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/resourceeditor/qrceditor/resourceview.h | 3 ---
 src/plugins/resourceeditor/resourceeditorplugin.h   | 2 --
 2 files changed, 5 deletions(-)

diff --git a/src/plugins/resourceeditor/qrceditor/resourceview.h b/src/plugins/resourceeditor/qrceditor/resourceview.h
index d53f9546858..d15a6389931 100644
--- a/src/plugins/resourceeditor/qrceditor/resourceview.h
+++ b/src/plugins/resourceeditor/qrceditor/resourceview.h
@@ -32,9 +32,6 @@
 #include <QPoint>
 
 QT_BEGIN_NAMESPACE
-class QAction;
-class QMenu;
-class QMouseEvent;
 class QUndoStack;
 QT_END_NAMESPACE
 
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.h b/src/plugins/resourceeditor/resourceeditorplugin.h
index 0baf20f924b..6da00794635 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.h
+++ b/src/plugins/resourceeditor/resourceeditorplugin.h
@@ -38,8 +38,6 @@ namespace ResourceEditor {
 namespace Internal {
 
 class ResourceEditorW;
-class ResourceWizard;
-class ResourceEditorFactory;
 
 class ResourceEditorPlugin : public ExtensionSystem::IPlugin
 {

From 1005fa9b68f61f56829f117177c27791991deb38 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Mon, 25 Sep 2017 19:20:39 +0200
Subject: [PATCH 05/41] Clang: Initialize HighlightingTypes to Invalid

It is too easy to forget to initialize the type, so it can have a wrong
value. Actually we should use exceptions elsewhere because this can be
simply hiding bugs.

Change-Id: I71c0b467c12409b489c173e3edc53cdaa406bf09
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/libs/clangsupport/clangsupport_global.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/clangsupport/clangsupport_global.h b/src/libs/clangsupport/clangsupport_global.h
index b2fc639291a..f69b11b7d2e 100644
--- a/src/libs/clangsupport/clangsupport_global.h
+++ b/src/libs/clangsupport/clangsupport_global.h
@@ -154,7 +154,7 @@ struct MessageTrait<Message> \
 using MixinHighlightingTypes = Utils::SizedArray<HighlightingType, 6>;
 
 struct HighlightingTypes {
-    HighlightingType mainHighlightingType;
+    HighlightingType mainHighlightingType = HighlightingType::Invalid;
     MixinHighlightingTypes mixinHighlightingTypes;
 };
 

From b70637de4127d645e843098ebeffeafefc53aea0 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 25 Sep 2017 19:08:47 +0200
Subject: [PATCH 06/41] QbsProjectManager: Fix project parsing

Some recent ProjectExplorer refactorings caused the projects to stay
in the parsing state indefinitely, making it impossible to build or
run anything.

Change-Id: I458a5560cc8d0c7c3183c0f104f00b073039f28e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/qbsprojectmanager/qbsproject.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index f9f212fcb08..1d0121eab0e 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -142,12 +142,12 @@ QbsProject::QbsProject(const FileName &fileName) :
     connect(this, &Project::removedTarget, this, &QbsProject::targetWasRemoved);
     subscribeSignal(&BuildConfiguration::environmentChanged, this, [this]() {
         if (static_cast<BuildConfiguration *>(sender())->isActive())
-            startParsing();
+            delayParsing();
     });
     connect(this, &Project::activeProjectConfigurationChanged,
             this, [this](ProjectConfiguration *pc) {
         if (pc && pc->isActive())
-            startParsing();
+            delayParsing();
     });
 
     connect(&m_parsingDelay, &QTimer::timeout, this, &QbsProject::startParsing);
@@ -447,6 +447,7 @@ bool QbsProject::checkCancelStatus()
     qCDebug(qbsPmLog) << "Cancel request while parsing, starting re-parse";
     m_qbsProjectParser->deleteLater();
     m_qbsProjectParser = 0;
+    emitParsingFinished(false);
     parseCurrentBuildConfiguration();
     return true;
 }
@@ -537,7 +538,6 @@ void QbsProject::handleRuleExecutionDone()
     QTC_ASSERT(m_qbsProject.isValid(), return);
     m_projectData = m_qbsProject.projectData();
     updateAfterParse();
-    // finishParsing(true);
 }
 
 void QbsProject::targetWasAdded(Target *t)

From f3afac128be14372f09a10fc1d3cc5bdb087324d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 19 Sep 2017 18:39:43 +0200
Subject: [PATCH 07/41] ClangStaticAnalyzer: Avoid use of
 DummyRunConfigurations

This moves the explicit build step into a dependent runWorker,
making the whole setup more aligned with a normal tool run.

Change-Id: Icd01b2e82f7f95774434d2ede04d08a5311b64e7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
---
 .../clangstaticanalyzerplugin.cpp             |  15 --
 .../clangstaticanalyzerruncontrol.cpp         | 158 ++++++++++------
 .../clangstaticanalyzerruncontrol.h           |  14 +-
 .../clangstaticanalyzertool.cpp               | 178 +++++-------------
 .../clangstaticanalyzertool.h                 |  17 +-
 .../projectexplorer/runconfiguration.cpp      |   2 +
 6 files changed, 163 insertions(+), 221 deletions(-)

diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
index e18b9747b81..c67b811f52d 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
@@ -130,21 +130,6 @@ bool ClangStaticAnalyzerPlugin::initialize(const QStringList &arguments, QString
     addAutoReleasedObject(new ClangStaticAnalyzerTool);
     addAutoReleasedObject(new ClangStaticAnalyzerOptionsPage);
 
-    auto constraint = [](RunConfiguration *runConfiguration) {
-        Target *target = runConfiguration->target();
-        QTC_ASSERT(target, return false);
-
-        Project *project = target->project();
-        QTC_ASSERT(project, return false);
-
-        const Core::Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID;
-        return project->projectLanguages().contains(cxx)
-                && ToolChainKitInformation::toolChain(target->kit(), cxx);
-    };
-
-    RunControl::registerWorker<ClangStaticAnalyzerToolRunner>
-            (Constants::CLANGSTATICANALYZER_RUN_MODE, constraint, /*priority*/ -1);
-
     return true;
 }
 
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
index 94468e913e4..ef1c79b7bb1 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
@@ -35,6 +35,7 @@
 
 #include <clangcodemodel/clangutils.h>
 
+#include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/futureprogress.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
@@ -46,8 +47,10 @@
 
 #include <projectexplorer/abi.h>
 #include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/buildmanager.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorericons.h>
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
@@ -55,6 +58,7 @@
 #include <projectexplorer/toolchain.h>
 
 #include <utils/algorithm.h>
+#include <utils/checkablemessagebox.h>
 #include <utils/hostosinfo.h>
 #include <utils/temporarydirectory.h>
 
@@ -63,71 +67,74 @@
 
 using namespace CppTools;
 using namespace ProjectExplorer;
+using namespace Utils;
 
 static Q_LOGGING_CATEGORY(LOG, "qtc.clangstaticanalyzer.runcontrol")
 
 namespace ClangStaticAnalyzer {
 namespace Internal {
 
-ClangStaticAnalyzerToolRunner::ClangStaticAnalyzerToolRunner(RunControl *runControl)
-    : RunWorker(runControl)
+class ProjectBuilder : public RunWorker
 {
-    setDisplayName("ClangStaticAnalyzerRunner");
-    runControl->setDisplayName(tr("Clang Static Analyzer"));
-    runControl->setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
-    setSupportsReRunning(false);
-
-    RunConfiguration *runConfiguration = runControl->runConfiguration();
-    auto tool = ClangStaticAnalyzerTool::instance();
-    tool->stopAction()->disconnect();
-    connect(tool->stopAction(), &QAction::triggered, runControl, [&] {
-        initiateStop();
-        appendMessage(tr("Clang Static Analyzer stopped by user."),
-                      Utils::NormalMessageFormat);
-    });
-    tool->handleWorkerStart(this);
-
-    ProjectInfo projectInfoBeforeBuild = tool->projectInfoBeforeBuild();
-    QTC_ASSERT(projectInfoBeforeBuild.isValid(), return);
-
-    QTC_ASSERT(runConfiguration, return);
-    Target * const target = runConfiguration->target();
-    QTC_ASSERT(target, return);
-    Project * const project = target->project();
-    QTC_ASSERT(project, return);
-
-    // so pass on the updated Project Info unless no configuration change
-    // (defines/includes/files) happened.
-    const CppTools::ProjectInfo projectInfoAfterBuild
-            = CppTools::CppModelManager::instance()->projectInfo(project);
-
-    if (projectInfoAfterBuild.configurationOrFilesChanged(projectInfoBeforeBuild)) {
-        // If it's more than a release/debug build configuration change, e.g.
-        // a version control checkout, files might be not valid C++ anymore
-        // or even gone, so better stop here.
-
-        tool->resetCursorAndProjectInfoBeforeBuild();
-        reportFailure(tr(
-                "The project configuration changed since the start of the Clang Static Analyzer. "
-                "Please re-run with current configuration."));
-        return;
+public:
+    ProjectBuilder(RunControl *runControl, Project *project)
+        : RunWorker(runControl), m_project(project)
+    {
+        setDisplayName("ProjectBuilder");
     }
 
-    // Some projects provides CompilerCallData once a build is finished,
-    QTC_ASSERT(!projectInfoAfterBuild.configurationOrFilesChanged(projectInfoBeforeBuild),
-               return);
+    bool success() const { return m_success; }
 
-    m_projectInfo = projectInfoAfterBuild;
+private:
+    void start() final
+    {
+        Target *target = m_project->activeTarget();
+        QTC_ASSERT(target, reportFailure(); return);
 
-    BuildConfiguration *buildConfiguration = target->activeBuildConfiguration();
-    QTC_ASSERT(buildConfiguration, return);
-    m_environment = buildConfiguration->environment();
+        BuildConfiguration::BuildType buildType = BuildConfiguration::Unknown;
+        if (const BuildConfiguration *buildConfig = target->activeBuildConfiguration())
+            buildType = buildConfig->buildType();
 
-    ToolChain *toolChain = ToolChainKitInformation::toolChain(target->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID);
-    QTC_ASSERT(toolChain, return);
-    m_targetTriple = toolChain->originalTargetTriple();
-    m_toolChainType = toolChain->typeId();
-}
+        if (buildType == BuildConfiguration::Release) {
+            const QString wrongMode = ClangStaticAnalyzerTool::tr("Release");
+            const QString toolName = ClangStaticAnalyzerTool::tr("Clang Static Analyzer");
+            const QString title = ClangStaticAnalyzerTool::tr("Run %1 in %2 Mode?").arg(toolName)
+                    .arg(wrongMode);
+            const QString message = ClangStaticAnalyzerTool::tr(
+                        "<html><head/><body>"
+                        "<p>You are trying to run the tool \"%1\" on an application in %2 mode. The tool is "
+                        "designed to be used in Debug mode since enabled assertions can reduce the number of "
+                        "false positives.</p>"
+                        "<p>Do you want to continue and run the tool in %2 mode?</p>"
+                        "</body></html>")
+                    .arg(toolName).arg(wrongMode);
+            if (CheckableMessageBox::doNotAskAgainQuestion(Core::ICore::mainWindow(),
+                          title, message, Core::ICore::settings(),
+                          "ClangStaticAnalyzerCorrectModeWarning") != QDialogButtonBox::Yes)
+            {
+                reportFailure();
+                return;
+            }
+        }
+
+        connect(BuildManager::instance(), &BuildManager::buildQueueFinished,
+                this, &ProjectBuilder::onBuildFinished, Qt::QueuedConnection);
+
+        ProjectExplorerPlugin::buildProject(m_project);
+     }
+
+     void onBuildFinished(bool success)
+     {
+         disconnect(BuildManager::instance(), &BuildManager::buildQueueFinished,
+                    this, &ProjectBuilder::onBuildFinished);
+         m_success = success;
+         reportDone();
+     }
+
+private:
+     QPointer<Project> m_project;
+     bool m_success = false;
+};
 
 static void prependWordWidthArgumentIfNotIncluded(QStringList *arguments,
                                                   ProjectPart::ToolChainWordWidth wordWidth)
@@ -390,16 +397,47 @@ static QDebug operator<<(QDebug debug, const AnalyzeUnits &analyzeUnits)
     return debug;
 }
 
+ClangStaticAnalyzerToolRunner::ClangStaticAnalyzerToolRunner(RunControl *runControl, Target *target)
+    : RunWorker(runControl), m_target(target)
+{
+    setDisplayName("ClangStaticAnalyzerRunner");
+    setSupportsReRunning(false);
+
+    m_projectBuilder = new ProjectBuilder(runControl, target->project());
+    addStartDependency(m_projectBuilder);
+
+    m_projectInfoBeforeBuild = CppTools::CppModelManager::instance()->projectInfo(target->project());
+
+    BuildConfiguration *buildConfiguration = target->activeBuildConfiguration();
+    QTC_ASSERT(buildConfiguration, return);
+    m_environment = buildConfiguration->environment();
+
+    ToolChain *toolChain = ToolChainKitInformation::toolChain(target->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID);
+    QTC_ASSERT(toolChain, return);
+    m_targetTriple = toolChain->originalTargetTriple();
+    m_toolChainType = toolChain->typeId();
+}
+
 void ClangStaticAnalyzerToolRunner::start()
 {
-    m_success = false;
-    ClangStaticAnalyzerTool::instance()->onEngineIsStarting();
+    m_success = m_projectBuilder->success();
+    if (!m_success) {
+        reportFailure();
+        return;
+    }
 
-    connect(runControl(), &RunControl::stopped, this, [this] {
-            ClangStaticAnalyzerTool::instance()->onEngineFinished(m_success);
-    });
+    m_projectInfo = CppTools::CppModelManager::instance()->projectInfo(m_target->project());
+
+    // Some projects provides CompilerCallData once a build is finished,
+    if (m_projectInfo.configurationOrFilesChanged(m_projectInfoBeforeBuild)) {
+        // If it's more than a release/debug build configuration change, e.g.
+        // a version control checkout, files might be not valid C++ anymore
+        // or even gone, so better stop here.
+        reportFailure(tr("The project configuration changed since the start of "
+                         "the Clang Static Analyzer. Please re-run with current configuration."));
+        return;
+    }
 
-    QTC_ASSERT(m_projectInfo.isValid(), reportFailure(); return);
     const Utils::FileName projectFile = m_projectInfo.project()->projectFilePath();
     appendMessage(tr("Running Clang Static Analyzer on %1").arg(projectFile.toUserOutput()),
                   Utils::NormalMessageFormat);
@@ -502,7 +540,7 @@ void ClangStaticAnalyzerToolRunner::stop()
     m_runners.clear();
     m_unitsToProcess.clear();
     m_progress.reportFinished();
-    ClangStaticAnalyzerTool::instance()->onEngineFinished(m_success);
+    //ClangStaticAnalyzerTool::instance()->onEngineFinished(m_success);
     reportStopped();
 }
 
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
index e75660287ff..16d50f085cd 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
@@ -36,6 +36,7 @@ namespace ClangStaticAnalyzer {
 namespace Internal {
 
 class ClangStaticAnalyzerRunner;
+class ProjectBuilder;
 class Diagnostic;
 
 struct AnalyzeUnit {
@@ -52,14 +53,15 @@ class ClangStaticAnalyzerToolRunner : public ProjectExplorer::RunWorker
     Q_OBJECT
 
 public:
-    explicit ClangStaticAnalyzerToolRunner(ProjectExplorer::RunControl *runControl);
-
-    void start() override;
-    void stop() override;
+    ClangStaticAnalyzerToolRunner(ProjectExplorer::RunControl *runControl,
+                                  ProjectExplorer::Target *target);
 
     bool success() const { return m_success; } // For testing.
 
 private:
+    void start() final;
+    void stop() final;
+
     AnalyzeUnits sortedUnitsToAnalyze();
     void analyzeNextFile();
     ClangStaticAnalyzerRunner *createRunner();
@@ -74,6 +76,10 @@ private:
     void finalize();
 
 private:
+    QPointer<ProjectExplorer::Target> m_target;
+    ProjectBuilder *m_projectBuilder;
+
+    CppTools::ProjectInfo m_projectInfoBeforeBuild;
     CppTools::ProjectInfo m_projectInfo;
     QString m_targetTriple;
     Core::Id m_toolChainType;
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
index 9e90a024676..25bdff2760d 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
@@ -36,24 +36,19 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 
-#include <cpptools/cppmodelmanager.h>
-
 #include <debugger/analyzer/analyzermanager.h>
 
-#include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/session.h>
+#include <projectexplorer/projectexplorericons.h>
 #include <projectexplorer/target.h>
+#include <projectexplorer/session.h>
 
-#include <utils/checkablemessagebox.h>
 #include <utils/fancymainwindow.h>
 #include <utils/utilsicons.h>
 
 #include <QAction>
-#include <QDockWidget>
-#include <QHBoxLayout>
 #include <QLabel>
-#include <QListView>
 #include <QSortFilterProxyModel>
 #include <QToolButton>
 
@@ -65,23 +60,6 @@ using namespace Utils;
 namespace ClangStaticAnalyzer {
 namespace Internal {
 
-class DummyRunConfiguration : public RunConfiguration
-{
-    Q_OBJECT
-
-public:
-    DummyRunConfiguration(Target *parent)
-        : RunConfiguration(parent)
-    {
-        initialize("ClangStaticAnalyzer.DummyRunConfig");
-        setDefaultDisplayName(tr("Clang Static Analyzer"));
-        setEnabled(true);
-    }
-
-private:
-    QWidget *createConfigurationWidget() override { return 0; }
-};
-
 static ClangStaticAnalyzerTool *s_instance;
 
 ClangStaticAnalyzerTool::ClangStaticAnalyzerTool()
@@ -180,90 +158,43 @@ ClangStaticAnalyzerTool *ClangStaticAnalyzerTool::instance()
     return s_instance;
 }
 
-static bool dontStartAfterHintForDebugMode(Project *project)
-{
-    BuildConfiguration::BuildType buildType = BuildConfiguration::Unknown;
-    if (project) {
-        if (const Target *target = project->activeTarget()) {
-            if (const BuildConfiguration *buildConfig = target->activeBuildConfiguration())
-                buildType = buildConfig->buildType();
-        }
-    }
-
-    if (buildType == BuildConfiguration::Release) {
-        const QString wrongMode = ClangStaticAnalyzerTool::tr("Release");
-        const QString toolName = ClangStaticAnalyzerTool::tr("Clang Static Analyzer");
-        const QString title = ClangStaticAnalyzerTool::tr("Run %1 in %2 Mode?").arg(toolName)
-                .arg(wrongMode);
-        const QString message = ClangStaticAnalyzerTool::tr(
-            "<html><head/><body>"
-            "<p>You are trying to run the tool \"%1\" on an application in %2 mode. The tool is "
-            "designed to be used in Debug mode since enabled assertions can reduce the number of "
-            "false positives.</p>"
-            "<p>Do you want to continue and run the tool in %2 mode?</p>"
-            "</body></html>")
-                .arg(toolName).arg(wrongMode);
-        if (Utils::CheckableMessageBox::doNotAskAgainQuestion(Core::ICore::mainWindow(),
-                title, message, Core::ICore::settings(),
-                QLatin1String("ClangStaticAnalyzerCorrectModeWarning")) != QDialogButtonBox::Yes)
-            return true;
-    }
-
-    return false;
-}
-
-void ClangStaticAnalyzerTool::handleWorkerStart(RunWorker *runWorker)
-{
-    RunControl *runControl = runWorker->runControl();
-    Project *project = runControl->project();
-    QTC_ASSERT(project, emit finished(false); return);
-
-    Debugger::selectPerspective(ClangStaticAnalyzerPerspectiveId);
-    m_diagnosticModel->clear();
-    setBusyCursor(true);
-    m_diagnosticFilterModel->setProject(project);
-    m_projectInfoBeforeBuild = CppTools::CppModelManager::instance()->projectInfo(project);
-    QTC_ASSERT(m_projectInfoBeforeBuild.isValid(), emit finished(false); return);
-    m_running = true;
-    handleStateUpdate();
-
-    m_toolBusy = true;
-    updateRunActions();
-}
-
 void ClangStaticAnalyzerTool::startTool()
 {
+    auto runControl = new RunControl(nullptr, Constants::CLANGSTATICANALYZER_RUN_MODE);
+    runControl->setDisplayName(tr("Clang Static Analyzer"));
+    runControl->setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR);
+
     Project *project = SessionManager::startupProject();
     QTC_ASSERT(project, return);
-    Target *target = project->activeTarget();
-    QTC_ASSERT(target, return);
-    DummyRunConfiguration *& rc = m_runConfigs[target];
-    if (!rc) {
-        rc = new DummyRunConfiguration(target);
-        connect(project, &Project::aboutToRemoveTarget, this,
-                [this](Target *t) { m_runConfigs.remove(t); });
-        const auto onProjectRemoved = [this](Project *p) {
-            foreach (Target * const t, p->targets())
-                m_runConfigs.remove(t);
-        };
-        connect(SessionManager::instance(), &SessionManager::aboutToRemoveProject, this,
-                onProjectRemoved, Qt::UniqueConnection);
-    }
-    if (dontStartAfterHintForDebugMode(project))
-        return;
 
-    ProjectExplorerPlugin::runRunConfiguration(rc, Constants::CLANGSTATICANALYZER_RUN_MODE);
-}
+    auto clangTool = new ClangStaticAnalyzerToolRunner(runControl, project->activeTarget());
 
-CppTools::ProjectInfo ClangStaticAnalyzerTool::projectInfoBeforeBuild() const
-{
-    return m_projectInfoBeforeBuild;
-}
+    m_stopAction->disconnect();
+    connect(m_stopAction, &QAction::triggered, runControl, [this, runControl] {
+        runControl->appendMessage(tr("Clang Static Analyzer stopped by user."),
+                                  NormalMessageFormat);
+        runControl->initiateStop();
+    });
 
-void ClangStaticAnalyzerTool::resetCursorAndProjectInfoBeforeBuild()
-{
-    setBusyCursor(false);
-    m_projectInfoBeforeBuild = CppTools::ProjectInfo();
+    connect(runControl, &RunControl::stopped, this, [this, clangTool] {
+        bool success = clangTool->success();
+        setToolBusy(false);
+        m_running = false;
+        handleStateUpdate();
+        updateRunActions();
+        emit finished(success);
+    });
+
+    Debugger::selectPerspective(ClangStaticAnalyzerPerspectiveId);
+
+    m_diagnosticModel->clear();
+    setToolBusy(true);
+    m_diagnosticFilterModel->setProject(project);
+    m_running = true;
+    handleStateUpdate();
+    updateRunActions();
+
+    ProjectExplorerPlugin::startRunControl(runControl);
 }
 
 QList<Diagnostic> ClangStaticAnalyzerTool::diagnostics() const
@@ -271,27 +202,12 @@ QList<Diagnostic> ClangStaticAnalyzerTool::diagnostics() const
     return m_diagnosticModel->diagnostics();
 }
 
-void ClangStaticAnalyzerTool::onEngineIsStarting()
-{
-    QTC_ASSERT(m_diagnosticModel, return);
-}
-
 void ClangStaticAnalyzerTool::onNewDiagnosticsAvailable(const QList<Diagnostic> &diagnostics)
 {
     QTC_ASSERT(m_diagnosticModel, return);
     m_diagnosticModel->addDiagnostics(diagnostics);
 }
 
-void ClangStaticAnalyzerTool::onEngineFinished(bool success)
-{
-    resetCursorAndProjectInfoBeforeBuild();
-    m_running = false;
-    handleStateUpdate();
-    emit finished(success);
-    m_toolBusy = false;
-    updateRunActions();
-}
-
 void ClangStaticAnalyzerTool::updateRunActions()
 {
     if (m_toolBusy) {
@@ -299,19 +215,27 @@ void ClangStaticAnalyzerTool::updateRunActions()
         m_startAction->setToolTip(tr("Clang Static Analyzer is still running."));
         m_stopAction->setEnabled(true);
     } else {
-        QString whyNot = tr("Start Clang Static Analyzer.");
-        bool canRun = ProjectExplorerPlugin::canRunStartupProject(
-            Constants::CLANGSTATICANALYZER_RUN_MODE, &whyNot);
-        m_startAction->setToolTip(whyNot);
+        QString toolTip = tr("Start Clang Static Analyzer.");
+        Project *project = SessionManager::startupProject();
+        Target *target = project ? project->activeTarget() : nullptr;
+        const Core::Id cxx = ProjectExplorer::Constants::CXX_LANGUAGE_ID;
+        bool canRun = target && project->projectLanguages().contains(cxx)
+                && ToolChainKitInformation::toolChain(target->kit(), cxx);
+        if (!canRun)
+            toolTip = tr("This is not C++ project");
+
+        m_startAction->setToolTip(toolTip);
         m_startAction->setEnabled(canRun);
         m_stopAction->setEnabled(false);
     }
 }
-void ClangStaticAnalyzerTool::setBusyCursor(bool busy)
+
+void ClangStaticAnalyzerTool::setToolBusy(bool busy)
 {
     QTC_ASSERT(m_diagnosticView, return);
     QCursor cursor(busy ? Qt::BusyCursor : Qt::ArrowCursor);
     m_diagnosticView->setCursor(cursor);
+    m_toolBusy = busy;
 }
 
 void ClangStaticAnalyzerTool::handleStateUpdate()
@@ -326,8 +250,12 @@ void ClangStaticAnalyzerTool::handleStateUpdate()
     m_goBack->setEnabled(issuesVisible > 1);
     m_goNext->setEnabled(issuesVisible > 1);
 
-    QString message = m_running ? tr("Clang Static Analyzer is running.")
-                                : tr("Clang Static Analyzer finished.");
+    QString message;
+    if (m_running)
+        message = tr("Clang Static Analyzer is running.");
+    else
+        message = tr("Clang Static Analyzer finished.");
+
     message += QLatin1Char(' ');
     if (issuesFound == 0) {
         message += tr("No issues found.");
@@ -340,5 +268,3 @@ void ClangStaticAnalyzerTool::handleStateUpdate()
 
 } // namespace Internal
 } // namespace ClangStaticAnalyzer
-
-#include "clangstaticanalyzertool.moc"
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
index 06550bce315..334ec07b93c 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
@@ -28,8 +28,6 @@
 #include <projectexplorer/runconfiguration.h>
 #include <cpptools/projectinfo.h>
 
-#include <QHash>
-
 namespace ClangStaticAnalyzer {
 namespace Internal {
 
@@ -37,7 +35,6 @@ class ClangStaticAnalyzerDiagnosticFilterModel;
 class ClangStaticAnalyzerDiagnosticModel;
 class ClangStaticAnalyzerDiagnosticView;
 class Diagnostic;
-class DummyRunConfiguration;
 
 const char ClangStaticAnalyzerPerspectiveId[] = "ClangStaticAnalyzer.Perspective";
 const char ClangStaticAnalyzerDockId[]        = "ClangStaticAnalyzer.Dock";
@@ -51,32 +48,21 @@ public:
     ~ClangStaticAnalyzerTool();
 
     static ClangStaticAnalyzerTool *instance();
-    QAction *stopAction() { return m_stopAction; }
-
-    CppTools::ProjectInfo projectInfoBeforeBuild() const;
-    void resetCursorAndProjectInfoBeforeBuild();
 
     // For testing.
     QList<Diagnostic> diagnostics() const;
     void startTool();
 
-    void handleWorkerStart(ProjectExplorer::RunWorker *runWorker);
-
-    void onEngineIsStarting();
     void onNewDiagnosticsAvailable(const QList<Diagnostic> &diagnostics);
-    void onEngineFinished(bool success);
 
 signals:
     void finished(bool success); // For testing.
 
 private:
-    void setBusyCursor(bool busy);
+    void setToolBusy(bool busy);
     void handleStateUpdate();
     void updateRunActions();
 
-private:
-    CppTools::ProjectInfo m_projectInfoBeforeBuild;
-
     ClangStaticAnalyzerDiagnosticModel *m_diagnosticModel = nullptr;
     ClangStaticAnalyzerDiagnosticFilterModel *m_diagnosticFilterModel = nullptr;
     ClangStaticAnalyzerDiagnosticView *m_diagnosticView = nullptr;
@@ -85,7 +71,6 @@ private:
     QAction *m_stopAction = nullptr;
     QAction *m_goBack = nullptr;
     QAction *m_goNext = nullptr;
-    QHash<ProjectExplorer::Target *, DummyRunConfiguration *> m_runConfigs;
     bool m_running = false;
     bool m_toolBusy = false;
 };
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index db50d1cafaf..1c38f856385 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -616,6 +616,8 @@ public:
             outputFormatter = runConfiguration->createOutputFormatter();
             device = DeviceKitInformation::device(runConfiguration->target()->kit());
             project = runConfiguration->target()->project();
+        } else {
+            outputFormatter = new OutputFormatter();
         }
     }
 

From b81396c36e3f88f4bad6f4ee5bbce7db390f6b9f Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Tue, 26 Sep 2017 12:58:40 +0200
Subject: [PATCH 08/41] QmlDesigner: Fix compile

Did not compile with GCC 5.3 because frames and frames()
are ambiguous.
The new function name is more descriptive.

Change-Id: I832a02fb56dbada07dc8622b566762fb32139d3f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../designercore/include/qmltimelinemutator.h          |  2 +-
 .../designercore/model/qmltimelinemutator.cpp          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/include/qmltimelinemutator.h b/src/plugins/qmldesigner/designercore/include/qmltimelinemutator.h
index 44327fcb25c..10e00fc7b33 100644
--- a/src/plugins/qmldesigner/designercore/include/qmltimelinemutator.h
+++ b/src/plugins/qmldesigner/designercore/include/qmltimelinemutator.h
@@ -56,7 +56,7 @@ public:
 private:
     void addFramesIfNotExists(const ModelNode &node, const PropertyName &propertyName);
     bool hasFrames(const ModelNode &node, const PropertyName &propertyName) const;
-    QList<QmlTimelineFrames> frames() const;
+    QList<QmlTimelineFrames> allTimelineFrames() const;
 };
 
 } //QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/model/qmltimelinemutator.cpp b/src/plugins/qmldesigner/designercore/model/qmltimelinemutator.cpp
index 48fb954a2ed..a028b61890d 100644
--- a/src/plugins/qmldesigner/designercore/model/qmltimelinemutator.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmltimelinemutator.cpp
@@ -142,17 +142,17 @@ void QmlTimelineMutator::addFramesIfNotExists(const ModelNode &node, const Prope
 
 bool QmlTimelineMutator::hasFrames(const ModelNode &node, const PropertyName &propertyName) const
 {
-    for (const QmlTimelineFrames &tFrames : frames()) {
-        if (tFrames.target().isValid()
-                && tFrames.target() == node
-                && tFrames.propertyName() == propertyName)
+    for (const QmlTimelineFrames &frames : allTimelineFrames()) {
+        if (frames.target().isValid()
+                && frames.target() == node
+                && frames.propertyName() == propertyName)
             return true;
     }
 
     return false;
 }
 
-QList<QmlTimelineFrames> QmlTimelineMutator::frames() const
+QList<QmlTimelineFrames> QmlTimelineMutator::allTimelineFrames() const
 {
     QList<QmlTimelineFrames> returnList;
 

From 21d07f0ed4d16eaa32420e02f70a23e867df8eb2 Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Mon, 25 Sep 2017 15:50:21 +0200
Subject: [PATCH 09/41] Clean forward declaration

Change-Id: I1935221134b168c3bfdba334265a299d82283ba3
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/macros/macroevent.h         | 1 -
 src/plugins/macros/macrolocatorfilter.h | 1 -
 src/plugins/macros/macromanager.h       | 4 ----
 src/plugins/macros/macrooptionswidget.h | 1 -
 4 files changed, 7 deletions(-)

diff --git a/src/plugins/macros/macroevent.h b/src/plugins/macros/macroevent.h
index 72ae9942d45..9cf82ac28f5 100644
--- a/src/plugins/macros/macroevent.h
+++ b/src/plugins/macros/macroevent.h
@@ -31,7 +31,6 @@
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE
-class QByteArray;
 class QDataStream;
 QT_END_NAMESPACE
 
diff --git a/src/plugins/macros/macrolocatorfilter.h b/src/plugins/macros/macrolocatorfilter.h
index f8dc6577537..d16553db3a7 100644
--- a/src/plugins/macros/macrolocatorfilter.h
+++ b/src/plugins/macros/macrolocatorfilter.h
@@ -31,7 +31,6 @@
 
 namespace Macros {
 
-class MacroManager;
 
 namespace Internal {
 
diff --git a/src/plugins/macros/macromanager.h b/src/plugins/macros/macromanager.h
index 9fb6cb18adb..18779b7df30 100644
--- a/src/plugins/macros/macromanager.h
+++ b/src/plugins/macros/macromanager.h
@@ -28,10 +28,6 @@
 #include <QObject>
 #include <QMap>
 
-QT_BEGIN_NAMESPACE
-class QAction;
-QT_END_NAMESPACE
-
 namespace Macros {
 namespace Internal {
 
diff --git a/src/plugins/macros/macrooptionswidget.h b/src/plugins/macros/macrooptionswidget.h
index 95a7e07fd0d..2e570c2a088 100644
--- a/src/plugins/macros/macrooptionswidget.h
+++ b/src/plugins/macros/macrooptionswidget.h
@@ -38,7 +38,6 @@ QT_END_NAMESPACE
 namespace Macros {
 namespace Internal {
 
-class MacroSettings;
 
 namespace Ui { class MacroOptionsWidget; }
 

From 08677c0b014cc44d944e32d462f502a67c948404 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Fri, 28 Jul 2017 11:16:18 +0200
Subject: [PATCH 10/41] CMake: Quieten soft-assert on small project loads

The directory tree scanner and the project parsing work independently of
each other. Add logic to combine these two sets of results into one
parsing state.

Change-Id: I46e94f0e866b40ee7225235c536c742cecf11b45
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../cmakeprojectmanager/builddirmanager.cpp   |  15 +-
 .../cmakeprojectmanager/builddirmanager.h     |   4 +-
 .../cmakebuildconfiguration.cpp               |  10 +-
 .../cmakebuildconfiguration.h                 |   3 +
 .../cmakeprojectmanager/cmakeproject.cpp      | 197 +++++++++++-------
 .../cmakeprojectmanager/cmakeproject.h        |  23 +-
 .../cmakeprojectmanager.cpp                   |   3 +-
 7 files changed, 154 insertions(+), 101 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/builddirmanager.cpp b/src/plugins/cmakeprojectmanager/builddirmanager.cpp
index 67ae9387af0..b64898d2b4f 100644
--- a/src/plugins/cmakeprojectmanager/builddirmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/builddirmanager.cpp
@@ -62,10 +62,6 @@ BuildDirManager::BuildDirManager(CMakeBuildConfiguration *bc) :
     m_buildConfiguration(bc)
 {
     QTC_ASSERT(bc, return);
-
-    m_reparseTimer.setSingleShot(true);
-
-    connect(&m_reparseTimer, &QTimer::timeout, this, &BuildDirManager::parse);
 }
 
 BuildDirManager::~BuildDirManager() = default;
@@ -209,7 +205,7 @@ void BuildDirManager::maybeForceReparseOnceReaderReady()
     // The critical keys *must* be set in cmake configuration, so those were already
     // handled above.
     if (mustReparse || kcit != targetConfig.constEnd())
-        parseOnceReaderReady(true);
+        emit requestReparse(true);
 }
 
 bool BuildDirManager::isParsing() const
@@ -232,7 +228,7 @@ void BuildDirManager::becameDirty()
     if (!tool->isAutoRun())
         return;
 
-    m_reparseTimer.start(1000);
+    emit requestReparse(false);
 }
 
 void BuildDirManager::forceReparse()
@@ -272,11 +268,6 @@ void BuildDirManager::resetData()
     m_buildTargets.clear();
 }
 
-bool BuildDirManager::updateCMakeStateBeforeBuild()
-{
-    return m_reparseTimer.isActive();
-}
-
 bool BuildDirManager::persistCMakeState()
 {
     if (!m_tempDir)
@@ -455,7 +446,7 @@ void BuildDirManager::maybeForceReparse()
         return;
 
     if (!m_reader || !m_reader->hasData()) {
-        forceReparse();
+        emit requestReparse(true);
         return;
     }
 
diff --git a/src/plugins/cmakeprojectmanager/builddirmanager.h b/src/plugins/cmakeprojectmanager/builddirmanager.h
index 489ca67ff7f..4db167d0428 100644
--- a/src/plugins/cmakeprojectmanager/builddirmanager.h
+++ b/src/plugins/cmakeprojectmanager/builddirmanager.h
@@ -67,7 +67,6 @@ public:
     void forceReparseWithoutCheckingForChanges();
     void maybeForceReparse(); // Only reparse if the configuration has changed...
     void resetData();
-    bool updateCMakeStateBeforeBuild();
     bool persistCMakeState();
 
     void generateProjectTree(CMakeProjectNode *root,
@@ -83,6 +82,7 @@ public:
     CMakeBuildConfiguration *buildConfiguration() const { return m_buildConfiguration; }
 
 signals:
+    void requestReparse(bool urgent) const;
     void configurationStarted() const;
     void dataAvailable() const;
     void errorOccured(const QString &err) const;
@@ -109,8 +109,6 @@ private:
     mutable std::unique_ptr<Utils::TemporaryDirectory> m_tempDir = nullptr;
     mutable CMakeConfig m_cmakeCache;
 
-    QTimer m_reparseTimer;
-
     std::unique_ptr<BuildDirReader> m_reader;
 
     mutable QList<CMakeBuildTarget> m_buildTargets;
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 59bdaf1168b..a62fa7f4af4 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -142,10 +142,12 @@ void CMakeBuildConfiguration::ctor()
                                            target()->kit(),
                                            displayName(), BuildConfiguration::Unknown));
 
+    connect(m_buildDirManager.get(), &BuildDirManager::requestReparse,
+            this, [this](bool urgent) { emit requestReparse(this, urgent); });
     connect(m_buildDirManager.get(), &BuildDirManager::dataAvailable,
             this, [this, project]() {
         clearError();
-        project->updateProjectData(this);
+        project->handleParsingSuccess(this);
     });
     connect(m_buildDirManager.get(), &BuildDirManager::errorOccured,
             this, [this, project](const QString &msg) {
@@ -153,9 +155,9 @@ void CMakeBuildConfiguration::ctor()
         project->handleParsingError(this);
     });
     connect(m_buildDirManager.get(), &BuildDirManager::configurationStarted,
-            this, [this, project]() {
-        project->handleParsingStarted(this);
+            this, [this]() {
         clearError(ForceEnabledChanged::True);
+        emit parsingStarted(this);
     });
 
     connect(this, &CMakeBuildConfiguration::environmentChanged,
@@ -188,7 +190,7 @@ bool CMakeBuildConfiguration::persistCMakeState()
 
 bool CMakeBuildConfiguration::updateCMakeStateBeforeBuild()
 {
-    return m_buildDirManager->updateCMakeStateBeforeBuild();
+    return static_cast<CMakeProject *>(project())->mustUpdateCMakeStateBeforeBuild();
 }
 
 void CMakeBuildConfiguration::runCMake()
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
index 5cc58bbdcb4..45a45ede73d 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
@@ -97,6 +97,9 @@ public:
     void buildTarget(const QString &buildTarget);
 
 signals:
+    void requestReparse(CMakeBuildConfiguration *, bool isUrgent);
+    void parsingStarted(CMakeBuildConfiguration *);
+
     void errorOccured(const QString &message);
     void warningOccured(const QString &message);
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 57de95ad1fa..2ab0037bd0e 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -51,6 +51,7 @@
 #include <qmljs/qmljsmodelmanagerinterface.h>
 
 #include <utils/algorithm.h>
+#include <utils/asconst.h>
 #include <utils/qtcassert.h>
 #include <utils/stringutils.h>
 #include <utils/hostosinfo.h>
@@ -76,12 +77,27 @@ using namespace Internal;
 CMakeProject::CMakeProject(const FileName &fileName) : Project(Constants::CMAKEMIMETYPE, fileName),
     m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this))
 {
+    m_delayedParsingTimer.setSingleShot(true);
+
+    connect(&m_delayedParsingTimer, &QTimer::timeout,
+            this, [this]() { startParsingProject(PARSE); });
+
     setId(CMakeProjectManager::Constants::CMAKEPROJECT_ID);
     setProjectContext(Core::Context(CMakeProjectManager::Constants::PROJECTCONTEXT));
     setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
     setDisplayName(projectDirectory().fileName());
 
-    connect(this, &CMakeProject::activeTargetChanged, this, &CMakeProject::handleActiveTargetChanged);
+    connect(this, &Project::activeProjectConfigurationChanged,
+            this, &CMakeProject::handleActiveProjectConfigurationChanged);
+
+    subscribeSignal(&CMakeBuildConfiguration::requestReparse,
+                    this, [this](CMakeBuildConfiguration *bc, bool isUrgent) {
+        if (bc->isActive()) {
+            m_delayedParsingTimer.setInterval(isUrgent ? 0 : 1000);
+            m_delayedParsingTimer.start();
+        }
+    });
+
     connect(&m_treeScanner, &TreeScanner::finished, this, &CMakeProject::handleTreeScanningFinished);
 
     m_treeScanner.setFilter([this](const Utils::MimeType &mimeType, const Utils::FileName &fn) {
@@ -116,8 +132,6 @@ CMakeProject::CMakeProject(const FileName &fileName) : Project(Constants::CMAKEM
         }
         return type;
     });
-
-    scanProjectTree();
 }
 
 CMakeProject::~CMakeProject()
@@ -134,14 +148,11 @@ CMakeProject::~CMakeProject()
 
 void CMakeProject::updateProjectData(CMakeBuildConfiguration *bc)
 {
+    Target *const t = activeTarget();
+
     QTC_ASSERT(bc, return);
-
-    Target *t = activeTarget();
-    if (!t || t->activeBuildConfiguration() != bc)
-        return;
-
-    if (!m_treeScanner.isFinished() || bc->isParsing())
-        return;
+    QTC_ASSERT(bc == (t ? t->activeBuildConfiguration() : nullptr), return);
+    QTC_ASSERT(m_treeScanner.isFinished() && !bc->isParsing(), return);
 
     Kit *k = t->kit();
 
@@ -189,19 +200,6 @@ void CMakeProject::updateProjectData(CMakeBuildConfiguration *bc)
     emit fileListChanged();
 
     emit bc->emitBuildTypeChanged();
-
-    emitParsingFinished(true);
-}
-
-void CMakeProject::handleParsingError(CMakeBuildConfiguration *bc)
-{
-    QTC_ASSERT(bc, return);
-
-    Target *t = activeTarget();
-    if (!t || t->activeBuildConfiguration() != bc)
-        return;
-
-    emitParsingFinished(false);
 }
 
 void CMakeProject::updateQmlJSCodeModel()
@@ -263,12 +261,49 @@ bool CMakeProject::supportsKit(Kit *k, QString *errorMessage) const
 
 void CMakeProject::runCMake()
 {
-    CMakeBuildConfiguration *bc = nullptr;
-    if (activeTarget())
-        bc = qobject_cast<CMakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration());
+    if (isParsing())
+        return;
 
-    if (bc)
+    startParsingProject(PARSE);
+}
+
+void CMakeProject::runCMakeAndScanProjectTree()
+{
+    if (isParsing())
+        return;
+
+    startParsingProject(static_cast<DataCollectionAction>(PARSE | SCAN));
+}
+
+void CMakeProject::startParsingProject(const CMakeProject::DataCollectionAction action)
+{
+    const bool runParse = action & PARSE;
+    const bool runScan = action & SCAN;
+
+    CMakeBuildConfiguration *bc = activeTarget()
+            ? qobject_cast<CMakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration())
+            : nullptr;
+    if (!bc)
+        return;
+
+    if (!m_treeScanner.isFinished() || m_waitingForScan)
+        return;
+
+    emitParsingStarted();
+
+    m_waitingForParse = runParse;
+    m_waitingForScan = runScan;
+    m_combinedScanAndParseResult = true;
+
+    if (runParse)
         bc->runCMake();
+
+    if (runScan) {
+        m_treeScanner.asyncScanForFiles(projectDirectory());
+        Core::ProgressManager::addTask(m_treeScanner.future(),
+                                       tr("Scan \"%1\" project tree").arg(displayName()),
+                                       "CMake.Scan.Tree");
+    }
 }
 
 void CMakeProject::buildCMakeTarget(const QString &buildTarget)
@@ -330,75 +365,84 @@ bool CMakeProject::setupTarget(Target *t)
     return true;
 }
 
-void CMakeProject::scanProjectTree()
+void CMakeProject::handleActiveProjectConfigurationChanged(ProjectConfiguration *pc)
 {
-    if (!m_treeScanner.isFinished())
+    if (auto bc = qobject_cast<CMakeBuildConfiguration *>(pc)) {
+        if (!bc->isActive())
+            return;
+    } else if (!qobject_cast<Target *>(pc)) {
         return;
-    m_treeScanner.asyncScanForFiles(projectDirectory());
-    Core::ProgressManager::addTask(m_treeScanner.future(),
-                                   tr("Scan \"%1\" project tree").arg(displayName()),
-                                   "CMake.Scan.Tree");
-}
-
-void CMakeProject::handleActiveTargetChanged()
-{
-    if (m_connectedTarget) {
-        disconnect(m_connectedTarget, &Target::activeBuildConfigurationChanged,
-                   this, &CMakeProject::handleActiveBuildConfigurationChanged);
-        disconnect(m_connectedTarget, &Target::kitChanged,
-                   this, &CMakeProject::handleActiveBuildConfigurationChanged);
     }
 
-    m_connectedTarget = activeTarget();
-
-    if (m_connectedTarget) {
-        connect(m_connectedTarget, &Target::activeBuildConfigurationChanged,
-                this, &CMakeProject::handleActiveBuildConfigurationChanged);
-        connect(m_connectedTarget, &Target::kitChanged,
-                this, &CMakeProject::handleActiveBuildConfigurationChanged);
-    }
-
-    handleActiveBuildConfigurationChanged();
-}
-
-void CMakeProject::handleActiveBuildConfigurationChanged()
-{
-    if (!activeTarget() || !activeTarget()->activeBuildConfiguration())
-        return;
-    auto activeBc = qobject_cast<CMakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration());
-
-    foreach (Target *t, targets()) {
-        foreach (BuildConfiguration *bc, t->buildConfigurations()) {
+    for (Target *t : targets()) {
+        for (BuildConfiguration *bc : t->buildConfigurations()) {
             auto i = qobject_cast<CMakeBuildConfiguration *>(bc);
             QTC_ASSERT(i, continue);
-            if (i == activeBc)
+            if (i->isActive()) {
+                m_waitingForParse = true;
                 i->maybeForceReparse();
-            else
+            } else {
                 i->resetData();
+            }
         }
     }
 }
 
-void CMakeProject::handleParsingStarted(const CMakeBuildConfiguration *bc)
-{
-    if (activeTarget() && activeTarget()->activeBuildConfiguration() == bc)
-        emitParsingStarted();
-}
-
 void CMakeProject::handleTreeScanningFinished()
 {
+    QTC_CHECK(m_waitingForScan);
+
     qDeleteAll(m_allFiles);
     m_allFiles = Utils::transform(m_treeScanner.release(), [](const FileNode *fn) { return fn; });
 
     auto t = activeTarget();
-    if (!t)
+    auto bc = qobject_cast<CMakeBuildConfiguration*>(t ? t->activeBuildConfiguration() : nullptr);
+    QTC_ASSERT(bc, return);
+
+    m_combinedScanAndParseResult = m_combinedScanAndParseResult && true;
+    m_waitingForScan = false;
+
+    combineScanAndParse(bc);
+}
+
+void CMakeProject::handleParsingSuccess(CMakeBuildConfiguration *bc)
+{
+    QTC_CHECK(m_waitingForParse);
+
+    if (!bc || !bc->isActive())
         return;
 
-    auto bc = qobject_cast<CMakeBuildConfiguration*>(t->activeBuildConfiguration());
-    if (!bc)
+    m_waitingForParse = false;
+    m_combinedScanAndParseResult = m_combinedScanAndParseResult && true;
+
+    combineScanAndParse(bc);
+}
+
+void CMakeProject::handleParsingError(CMakeBuildConfiguration *bc)
+{
+    QTC_CHECK(m_waitingForParse);
+
+    if (!bc || !bc->isActive())
         return;
 
-    updateProjectData(bc);
+    m_waitingForParse = false;
+    m_combinedScanAndParseResult = false;
+
+    combineScanAndParse(bc);
+}
+
+
+void CMakeProject::combineScanAndParse(CMakeBuildConfiguration *bc)
+{
+    QTC_ASSERT(bc && bc->isActive(), return);
+
+    if (m_waitingForParse || m_waitingForScan)
+        return;
+
+    if (m_combinedScanAndParseResult)
+        updateProjectData(bc);
+
+    emitParsingFinished(m_combinedScanAndParseResult);
 }
 
 CMakeBuildTarget CMakeProject::buildTargetForTitle(const QString &title)
@@ -539,6 +583,11 @@ void CMakeProject::updateApplicationAndDeploymentTargets()
     t->setDeploymentData(deploymentData);
 }
 
+bool CMakeProject::mustUpdateCMakeStateBeforeBuild()
+{
+    return m_delayedParsingTimer.isActive();
+}
+
 void CMakeProject::createGeneratedCodeModelSupport()
 {
     qDeleteAll(m_extraCompilers);
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h
index 1d3e047683f..2a6964fc8b6 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -37,6 +37,7 @@
 
 #include <QFuture>
 #include <QHash>
+#include <QTimer>
 
 #include <memory>
 
@@ -99,7 +100,7 @@ public:
     bool supportsKit(ProjectExplorer::Kit *k, QString *errorMessage = 0) const final;
 
     void runCMake();
-    void scanProjectTree();
+    void runCMakeAndScanProjectTree();
 
     // Context menu actions:
     void buildCMakeTarget(const QString &buildTarget);
@@ -113,12 +114,15 @@ protected:
 private:
     QList<CMakeBuildTarget> buildTargets() const;
 
-    void handleActiveTargetChanged();
-    void handleActiveBuildConfigurationChanged();
-    void handleParsingStarted(const Internal::CMakeBuildConfiguration *bc);
+    enum DataCollectionAction { PARSE = 1, SCAN = 2 };
+    void startParsingProject(const DataCollectionAction a);
+
+    void handleActiveProjectConfigurationChanged(ProjectExplorer::ProjectConfiguration *pc);
     void handleTreeScanningFinished();
-    void updateProjectData(Internal::CMakeBuildConfiguration *bc);
+    void handleParsingSuccess(Internal::CMakeBuildConfiguration *bc);
     void handleParsingError(Internal::CMakeBuildConfiguration *bc);
+    void combineScanAndParse(Internal::CMakeBuildConfiguration *bc);
+    void updateProjectData(Internal::CMakeBuildConfiguration *bc);
     void updateQmlJSCodeModel();
 
     void createGeneratedCodeModelSupport();
@@ -126,7 +130,7 @@ private:
     void updateTargetRunConfigurations(ProjectExplorer::Target *t);
     void updateApplicationAndDeploymentTargets();
 
-    ProjectExplorer::Target *m_connectedTarget = nullptr;
+    bool mustUpdateCMakeStateBeforeBuild();
 
     // TODO probably need a CMake specific node structure
     QList<CMakeBuildTarget> m_buildTargets;
@@ -134,10 +138,17 @@ private:
     QList<ProjectExplorer::ExtraCompiler *> m_extraCompilers;
 
     Internal::TreeScanner m_treeScanner;
+
+    bool m_waitingForScan = false;
+    bool m_waitingForParse = false;
+    bool m_combinedScanAndParseResult = false;
+
     QHash<QString, bool> m_mimeBinaryCache;
     QList<const ProjectExplorer::FileNode *> m_allFiles;
     mutable std::unique_ptr<Internal::CMakeProjectImporter> m_projectImporter;
 
+    QTimer m_delayedParsingTimer;
+
     friend class Internal::CMakeBuildConfiguration;
     friend class Internal::CMakeBuildSettingsWidget;
 };
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 7464261e8c3..420e0d0bd2d 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -152,6 +152,5 @@ void CMakeManager::rescanProject(Project *project)
     if (!cmakeProject || !cmakeProject->activeTarget() || !cmakeProject->activeTarget()->activeBuildConfiguration())
         return;
 
-    cmakeProject->scanProjectTree();
-    cmakeProject->runCMake(); // by my experience: every rescan run requires cmake run too
+    cmakeProject->runCMakeAndScanProjectTree();// by my experience: every rescan run requires cmake run too
 }

From 23a04c65927ba385ea466e7727d382eb3a779e6c Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Mon, 25 Sep 2017 16:20:56 +0200
Subject: [PATCH 11/41] Subscription: Handle already set up children

Auto-connect to children that are already connected when subscribing
to their parent.

Change-Id: I20cc76c818db5ad90dc126bdb8393506403dc4b6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/projectexplorer/subscription.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/plugins/projectexplorer/subscription.cpp b/src/plugins/projectexplorer/subscription.cpp
index 4ee9db21b1b..b878bdacdcf 100644
--- a/src/plugins/projectexplorer/subscription.cpp
+++ b/src/plugins/projectexplorer/subscription.cpp
@@ -54,6 +54,16 @@ void Subscription::subscribe(ProjectConfiguration *pc)
     QMetaObject::Connection conn = m_subscriber(pc);
     if (conn)
         m_connections.insert(pc, conn);
+
+    if (auto p = qobject_cast<Project *>(pc)) {
+        for (Target *t : p->targets()) {
+            for (ProjectConfiguration *pc : t->projectConfigurations())
+                m_subscriber(pc);
+        }
+    } else if (auto t = qobject_cast<Target *>(pc)) {
+        for (ProjectConfiguration *pc : t->projectConfigurations())
+            m_subscriber(pc);
+    }
 }
 
 void Subscription::unsubscribe(ProjectConfiguration *pc)
@@ -63,6 +73,16 @@ void Subscription::unsubscribe(ProjectConfiguration *pc)
         disconnect(c);
         m_connections.remove(pc);
     }
+    if (auto p = qobject_cast<Project *>(pc)) {
+        for (Target *t : p->targets()) {
+            for (ProjectConfiguration *pc : t->projectConfigurations())
+                unsubscribe(pc);
+        }
+    } else if (auto t = qobject_cast<Target *>(pc)) {
+        for (ProjectConfiguration *pc : t->projectConfigurations())
+            unsubscribe(pc);
+    }
+
 }
 
 ProjectSubscription::ProjectSubscription(const Subscription::Connector &s, const QObject *r,

From 2c2015970f8c4ca46d71771d5a5af4a698304608 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Tue, 26 Sep 2017 14:35:15 +0200
Subject: [PATCH 12/41] QmlDesigner: FormEditorToolButton needs Arrow curser

Since the selection and move behaivour changed and the
label is now a move gizmo, the
FormEditorToolButton needs an explicit arrow cursor.

Change-Id: I10eb37dab39160e6854dfc57d206f6f5f1c2bc68
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../qmldesigner/components/formeditor/formeditortoolbutton.cpp   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp b/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp
index c9d38985045..a4f2f3bff0c 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp
@@ -52,6 +52,7 @@ FormEditorToolButton::FormEditorToolButton(QAction *action, QGraphicsItem *paren
 
     setEnabled(m_action->isEnabled());
     setVisible(m_action->isVisible());
+    setCursor(Qt::ArrowCursor);
 }
 
 void FormEditorToolButton::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)

From 6d60aae8efb94c8db31f57952893f0b40e5184a8 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@qt.io>
Date: Mon, 25 Sep 2017 13:56:34 +0200
Subject: [PATCH 13/41] QmlPuppet: Check return value of fstat

Change-Id: I2b7c04712a883455d8a5a0daa1225c2ef84a0748
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp b/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp
index 53e7c7533ad..9cd0e2a9531 100644
--- a/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp
@@ -388,7 +388,8 @@ bool SharedMemory::createInternal(QSharedMemory::AccessMode mode, int size)
     }
 
     struct stat statBuffer;
-    fstat(m_fileHandle, &statBuffer);
+    if (fstat(m_fileHandle, &statBuffer) == -1)
+        return false;
     int fileSize = statBuffer.st_size;
 
     if (fileSize < size) {
@@ -457,7 +458,8 @@ bool SharedMemory::attachInternal(QSharedMemory::AccessMode mode)
     }
 
     struct stat statBuffer;
-    fstat(m_fileHandle, &statBuffer);
+    if (fstat(m_fileHandle, &statBuffer) == -1)
+        return false;
     int size = statBuffer.st_size;
 
     int protection = mode == QSharedMemory::ReadOnly ? PROT_READ : PROT_WRITE;

From f0755681971ad37feeeb6f7221a7b846ee16fc9a Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 27 Sep 2017 07:44:35 +0200
Subject: [PATCH 14/41] QmlDesginer: Fix compile with Qt5.6

Change-Id: Ifc4468ef4367ffd44a7ab9e9e51444f62fd88990
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../qmldesigner/components/navigator/navigatorwidget.cpp        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
index 0785e704df2..db4e7e1efda 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
@@ -118,7 +118,7 @@ QList<QToolButton *> NavigatorWidget::createToolBarWidgets()
     filter->setPopupMode(QToolButton::InstantPopup);
     filter->setProperty("noArrow", true);
     auto filterMenu = new QMenu(filter);
-    auto objectAction = new QAction(tr("Show only visible itmes."));
+    auto objectAction = new QAction(tr("Show only visible itmes."), nullptr);
     objectAction->setCheckable(true);
     objectAction->setChecked(
                 DesignerSettings::getValue(DesignerSettingsKey::NAVIGATOR_SHOW_ONLY_VISIBLE_ITEMS).toBool());

From 211dad03258b77fc44a8e17e7c39e4d5316ac1b9 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 27 Sep 2017 08:26:22 +0200
Subject: [PATCH 15/41] QmlDesigner: Fix translatable string

Change-Id: Ie116f05ee8a8c65f470b3bdd6363a92ca43f6acc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 .../qmldesigner/components/navigator/navigatorwidget.cpp        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
index db4e7e1efda..6f7995a185f 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
@@ -118,7 +118,7 @@ QList<QToolButton *> NavigatorWidget::createToolBarWidgets()
     filter->setPopupMode(QToolButton::InstantPopup);
     filter->setProperty("noArrow", true);
     auto filterMenu = new QMenu(filter);
-    auto objectAction = new QAction(tr("Show only visible itmes."), nullptr);
+    auto objectAction = new QAction(tr("Show only visible items."), nullptr);
     objectAction->setCheckable(true);
     objectAction->setChecked(
                 DesignerSettings::getValue(DesignerSettingsKey::NAVIGATOR_SHOW_ONLY_VISIBLE_ITEMS).toBool());

From 7dafb822ed57f24a77391535d73ff21bdb663c11 Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Mon, 25 Sep 2017 15:06:56 +0200
Subject: [PATCH 16/41] CMakeProjectManager: Clean forward declaration

Change-Id: I47cb6fbac276554e548383fe6945fd5cd38386c6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakecbpparser.h            | 1 -
 src/plugins/cmakeprojectmanager/cmakeeditor.h               | 1 -
 src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h | 1 -
 src/plugins/cmakeprojectmanager/cmakeproject.h              | 4 ----
 src/plugins/cmakeprojectmanager/cmakeprojectmanager.h       | 1 -
 src/plugins/cmakeprojectmanager/cmakeprojectplugin.h        | 1 -
 src/plugins/cmakeprojectmanager/servermodereader.h          | 1 -
 7 files changed, 10 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakecbpparser.h b/src/plugins/cmakeprojectmanager/cmakecbpparser.h
index 6069b7d1ad6..d1f5cf9569f 100644
--- a/src/plugins/cmakeprojectmanager/cmakecbpparser.h
+++ b/src/plugins/cmakeprojectmanager/cmakecbpparser.h
@@ -38,7 +38,6 @@
 
 namespace ProjectExplorer {
 class FileNode;
-class Kit;
 } // namespace ProjectExplorer
 
 namespace CMakeProjectManager {
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.h b/src/plugins/cmakeprojectmanager/cmakeeditor.h
index 7d5bda378cf..93151db5471 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.h
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.h
@@ -32,7 +32,6 @@ namespace CMakeProjectManager {
 namespace Internal {
 
 class CMakeEditorWidget;
-class CMakeSettingsPage;
 
 class CMakeEditor : public TextEditor::BaseTextEditor
 {
diff --git a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h
index 934d7b64e88..387addeac1d 100644
--- a/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h
+++ b/src/plugins/cmakeprojectmanager/cmakefilecompletionassist.h
@@ -31,7 +31,6 @@
 namespace CMakeProjectManager {
 namespace Internal {
 
-class CMakeSettingsPage;
 
 class CMakeFileCompletionAssist : public TextEditor::KeywordsCompletionAssistProcessor
 {
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h
index 2a6964fc8b6..40d3382a64b 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -41,10 +41,6 @@
 
 #include <memory>
 
-QT_BEGIN_NAMESPACE
-class QFileSystemWatcher;
-QT_END_NAMESPACE
-
 namespace CppTools { class CppProjectUpdater; }
 
 namespace CMakeProjectManager {
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
index c1d19514ea5..0a045c19c04 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
@@ -34,7 +34,6 @@ QT_END_NAMESPACE
 namespace CMakeProjectManager {
 namespace Internal {
 
-class CMakeSettingsPage;
 
 class CMakeManager : public QObject
 {
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
index de3112184a0..7f8524ff745 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
@@ -34,7 +34,6 @@ namespace Utils { class ParameterAction; }
 namespace CMakeProjectManager {
 
 class CMakeProject;
-class CMakeToolManager;
 
 namespace Internal {
 
diff --git a/src/plugins/cmakeprojectmanager/servermodereader.h b/src/plugins/cmakeprojectmanager/servermodereader.h
index f861483227a..bf5fe7337e7 100644
--- a/src/plugins/cmakeprojectmanager/servermodereader.h
+++ b/src/plugins/cmakeprojectmanager/servermodereader.h
@@ -36,7 +36,6 @@
 namespace CMakeProjectManager {
 namespace Internal {
 
-class CMakeListsNode;
 
 class ServerModeReader : public BuildDirReader
 {

From b89cd0a78a1328f83f6f4c2d13423ea86244d3eb Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Mon, 25 Sep 2017 15:10:00 +0200
Subject: [PATCH 17/41] DiffEditor: Clean forward declaration

Change-Id: Ifedc0041a5a7d736231057c092f430061c62f8fb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/diffeditor/diffeditor.h                 | 1 -
 src/plugins/diffeditor/diffview.h                   | 1 -
 src/plugins/diffeditor/sidebysidediffeditorwidget.h | 1 -
 src/plugins/diffeditor/unifieddiffeditorwidget.h    | 5 -----
 4 files changed, 8 deletions(-)

diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h
index 0777aed00e5..6da073439da 100644
--- a/src/plugins/diffeditor/diffeditor.h
+++ b/src/plugins/diffeditor/diffeditor.h
@@ -35,7 +35,6 @@ QT_BEGIN_NAMESPACE
 class QComboBox;
 class QSpinBox;
 class QToolBar;
-class QToolButton;
 class QStackedWidget;
 QT_END_NAMESPACE
 
diff --git a/src/plugins/diffeditor/diffview.h b/src/plugins/diffeditor/diffview.h
index 34c473d00c4..cbdc2cbdfde 100644
--- a/src/plugins/diffeditor/diffview.h
+++ b/src/plugins/diffeditor/diffview.h
@@ -37,7 +37,6 @@ namespace TextEditor { class TextEditorWidget; }
 
 namespace DiffEditor {
 
-class DiffEditorController;
 class FileData;
 
 namespace Internal {
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.h b/src/plugins/diffeditor/sidebysidediffeditorwidget.h
index 2b03308c9eb..4f97494b804 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.h
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.h
@@ -44,7 +44,6 @@ QT_END_NAMESPACE
 
 namespace DiffEditor {
 
-class DiffEditorController;
 class FileData;
 
 namespace Internal {
diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.h b/src/plugins/diffeditor/unifieddiffeditorwidget.h
index c05d05e9af1..3e697f7b439 100644
--- a/src/plugins/diffeditor/unifieddiffeditorwidget.h
+++ b/src/plugins/diffeditor/unifieddiffeditorwidget.h
@@ -35,11 +35,6 @@ class DisplaySettings;
 class FontSettings;
 }
 
-QT_BEGIN_NAMESPACE
-class QSplitter;
-class QTextCharFormat;
-QT_END_NAMESPACE
-
 namespace DiffEditor {
 
 class ChunkData;

From 784d9a62794bffcddb79efe000629c88d983b00e Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Mon, 25 Sep 2017 15:15:12 +0200
Subject: [PATCH 18/41] QMakeProjectManager: Clean forward declaration

Change-Id: If2a70a5b39b999119cb02c84b72a5a13891661dc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/qmakeprojectmanager/addlibrarywizard.h            | 1 -
 .../qmakeprojectmanager/customwidgetwizard/plugingenerator.h  | 1 -
 .../qmakeprojectmanager/desktopqmakerunconfiguration.h        | 1 -
 src/plugins/qmakeprojectmanager/externaleditors.h             | 1 -
 src/plugins/qmakeprojectmanager/makefileparse.h               | 4 ----
 src/plugins/qmakeprojectmanager/makestep.h                    | 1 -
 src/plugins/qmakeprojectmanager/profilehoverhandler.h         | 1 -
 src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h    | 1 -
 src/plugins/qmakeprojectmanager/qmakestep.h                   | 1 -
 9 files changed, 12 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/addlibrarywizard.h b/src/plugins/qmakeprojectmanager/addlibrarywizard.h
index 6a0201c398b..0c4cb4b7601 100644
--- a/src/plugins/qmakeprojectmanager/addlibrarywizard.h
+++ b/src/plugins/qmakeprojectmanager/addlibrarywizard.h
@@ -30,7 +30,6 @@
 
 QT_BEGIN_NAMESPACE
 class QRadioButton;
-class QCheckBox;
 class QLabel;
 QT_END_NAMESPACE
 
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h
index 2307a4ba779..a2ed5ef749a 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h
@@ -31,7 +31,6 @@
 #include <QMap>
 
 QT_BEGIN_NAMESPACE
-class QWidget;
 QT_END_NAMESPACE
 
 namespace Core { class GeneratedFile; }
diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h
index 706758038f4..5dde3c35349 100644
--- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h
+++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h
@@ -42,7 +42,6 @@ QT_END_NAMESPACE
 namespace QmakeProjectManager {
 
 class QmakeProFile;
-class QmakeProFileNode;
 class QmakeProject;
 
 namespace Internal {
diff --git a/src/plugins/qmakeprojectmanager/externaleditors.h b/src/plugins/qmakeprojectmanager/externaleditors.h
index 413b46a7d15..b7441501c41 100644
--- a/src/plugins/qmakeprojectmanager/externaleditors.h
+++ b/src/plugins/qmakeprojectmanager/externaleditors.h
@@ -33,7 +33,6 @@
 #include <QMap>
 
 QT_BEGIN_NAMESPACE
-class QProcess;
 class QTcpSocket;
 QT_END_NAMESPACE
 
diff --git a/src/plugins/qmakeprojectmanager/makefileparse.h b/src/plugins/qmakeprojectmanager/makefileparse.h
index aefc81e1f57..9a2abeb00ee 100644
--- a/src/plugins/qmakeprojectmanager/makefileparse.h
+++ b/src/plugins/qmakeprojectmanager/makefileparse.h
@@ -29,10 +29,6 @@
 #include <qtsupport/baseqtversion.h>
 #include <qmakeprojectmanager/qmakestep.h>
 
-QT_BEGIN_NAMESPACE
-class QLogggingCategory;
-QT_END_NAMESPACE
-
 namespace QmakeProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/qmakeprojectmanager/makestep.h b/src/plugins/qmakeprojectmanager/makestep.h
index 9f0abc91923..72a0b54e2ef 100644
--- a/src/plugins/qmakeprojectmanager/makestep.h
+++ b/src/plugins/qmakeprojectmanager/makestep.h
@@ -32,7 +32,6 @@
 namespace ProjectExplorer {
 class BuildStep;
 class IBuildStepFactory;
-class Task;
 }
 
 namespace QmakeProjectManager {
diff --git a/src/plugins/qmakeprojectmanager/profilehoverhandler.h b/src/plugins/qmakeprojectmanager/profilehoverhandler.h
index 381329a93c3..cc9f91ef02b 100644
--- a/src/plugins/qmakeprojectmanager/profilehoverhandler.h
+++ b/src/plugins/qmakeprojectmanager/profilehoverhandler.h
@@ -29,7 +29,6 @@
 #include <texteditor/codeassist/keywordscompletionassist.h>
 
 QT_BEGIN_NAMESPACE
-class QUrl;
 QT_END_NAMESPACE
 
 namespace QmakeProjectManager {
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h
index 31829d8acd2..a698653d7e7 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h
@@ -35,7 +35,6 @@ namespace Utils { class DetailsWidget; }
 
 namespace QmakeProjectManager {
 class QmakeBuildConfiguration;
-class QmakeProFileNode;
 
 namespace Internal {
 namespace Ui { class QmakeProjectConfigWidget; }
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h
index a69db1113eb..caf12b129a0 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakestep.h
@@ -38,7 +38,6 @@ class Abi;
 class BuildStep;
 class IBuildStepFactory;
 class Project;
-class Kit;
 } // namespace ProjectExplorer
 
 namespace QtSupport { class BaseQtVersion; }

From aeeeffbe68c03f347c981a91a5fa33b37bc0fbd0 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Wed, 27 Sep 2017 09:45:09 +0200
Subject: [PATCH 19/41] qtcreatoricons.svg: Pacify recent Inkscape versions

Since a few versions, Inkscape wants to add a inkscape:locked to
guides. In order to have less patch cleanup duty for each svg
commit, we just concede that to Inkscape.

Change-Id: I8c096b7db15dc776976281cf9d20444e1654bb01
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/tools/icons/qtcreatoricons.svg | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index d82f71ae752..d27d37665e1 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -511,31 +511,38 @@
     <sodipodi:guide
        orientation="0,1"
        position="0,32"
-       id="guide2989" />
+       id="guide2989"
+       inkscape:locked="false" />
     <sodipodi:guide
        orientation="0,1"
        position="0,0"
-       id="guide2991" />
+       id="guide2991"
+       inkscape:locked="false" />
     <sodipodi:guide
        orientation="0,1"
        position="56,16"
-       id="guide3045" />
+       id="guide3045"
+       inkscape:locked="false" />
     <sodipodi:guide
        orientation="0,1"
        position="0,48"
-       id="guide4261" />
+       id="guide4261"
+       inkscape:locked="false" />
     <sodipodi:guide
        orientation="0,1"
        position="0,64"
-       id="guide4543" />
+       id="guide4543"
+       inkscape:locked="false" />
     <sodipodi:guide
        orientation="0,1"
        position="0,80"
-       id="guide4545" />
+       id="guide4545"
+       inkscape:locked="false" />
     <sodipodi:guide
        orientation="0,1"
        position="0,100"
-       id="guide4574" />
+       id="guide4574"
+       inkscape:locked="false" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">

From c4438cc4c306ff2232ce026ab5adb8f2bcad613d Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Wed, 27 Sep 2017 06:21:52 +0200
Subject: [PATCH 20/41] Qnx: Have a proper default device icon

Themable and HighDPI-able.

Change-Id: Ieefa19f3a569d9b9fbb3349f9bb6ac67453eff1f
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/qnx/images/qnx-target.png        | Bin 2810 -> 0 bytes
 src/plugins/qnx/images/qnxdevice.png         | Bin 0 -> 428 bytes
 src/plugins/qnx/images/qnxdevice@2x.png      | Bin 0 -> 899 bytes
 src/plugins/qnx/images/qnxdevicesmall.png    | Bin 0 -> 247 bytes
 src/plugins/qnx/images/qnxdevicesmall@2x.png | Bin 0 -> 445 bytes
 src/plugins/qnx/qnx.qrc                      |   5 ++-
 src/plugins/qnx/qnxconfiguration.cpp         |   1 -
 src/plugins/qnx/qnxconstants.h               |   1 -
 src/plugins/qnx/qnxdevicefactory.cpp         |   9 +++-
 src/tools/icons/qtcreatoricons.svg           |  43 +++++++++++++++++++
 10 files changed, 55 insertions(+), 4 deletions(-)
 delete mode 100644 src/plugins/qnx/images/qnx-target.png
 create mode 100644 src/plugins/qnx/images/qnxdevice.png
 create mode 100644 src/plugins/qnx/images/qnxdevice@2x.png
 create mode 100644 src/plugins/qnx/images/qnxdevicesmall.png
 create mode 100644 src/plugins/qnx/images/qnxdevicesmall@2x.png

diff --git a/src/plugins/qnx/images/qnx-target.png b/src/plugins/qnx/images/qnx-target.png
deleted file mode 100644
index be59d15b821dcb5638067d3ac716cebfa2b26aed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2810
zcmeAS@N?(olHy`uVBq!ia0y~yU<hMiV36ZrVqjpfw69ypz`%9T)5S3);_%y<?ZKg*
zV#ogar-cL*89i8~ki-<oVz`#^v4lXNiU!j<#*<Bp*L5Y9lpNEI6@Imd<Ap+3gM`PV
z$r_H68aQ3b>))GxiCNEoXV%?Yt7d);yT00ezu$A~`#;aUJl#<L@4h|rKBo_&Ou8)j
z_x5Dw<kWn8<XT+(d3X7HyP6*#etpfpc=^(uJ2!9sJl?KgY;2tJ{G9G=^Y-?(d*1%_
zUtfj3(%+wRe_QXo6CXab^UIZ#mi|4cXi@ZI!_?N+e+wL+si`F{Txe=)x_j}WGd;a8
zH<}pV-d~<yUHv;h;#czf&(;kJCD-+mnVS#ZughMrUVcMmabaQMfn~lm@?XxH*R-{@
zY}vN0F2v@qw2w?_dHMeO|NB;df9P*j>i2)e>z_)?YHj!D?qOrP-z&}A&T~=PqTtDf
zM0S1|4K1yx%~@9iY;CLlrR3IrIxc_v)~%@Ms9CdSMMXskbe}(az)5BC+oz|~&(9MT
z6%(>%3Ay$5cIL{J<?rvDJay{S>9cFstZ<0GAj{Z3gCpo|ZmxcGbZT><!?I#-kyqCz
z+H^&l)J@est(iY1c+2K{`)a#6Yl;%szBmX7%f8*0aPX09cUf!8ljl!uYk!Hv>CCdP
z@7!G-;^N|2SXf$WdhpQtjfRHhmoCj%e}~g}o_+niNt22a{@2yV$EWSwxx=Tpq-2K8
z&BRM8$2Eh~eCGdqzO(rHx=7}Q|LUIkIM&$}DfdN0M{^(9xV!xOmKhTN)~s3;wD3T=
zj?bRDTK^oK!~6PsQ*S)nVPX04w{7*hxSdKjw3a`Z)UrDKrzf9v*%uADLvxPz%T1j=
zoqOqZhk&rCS)YFt#>L4^I}k0?dh^SZ=g+TSziO!W_ubvh;N?=%Qc*Kz{i>+8U%PHv
zUP_IhAD`7Lo7`DbcUm?wmv?A}E-pUt;GkMt+v8(>v73vYF6|aq6uGhSw2!!WaB{No
zMIRpt0daA6wIIg}cdl$P)i`nK&YVQ$HEYZ&D%Zwu&wKLWVbY?VD_725{rYS6b&EX;
zmUUjc3X{K`naMFng8BI0+8Qoy?$f7E2?+~(GWEP{Y<O}#ApZW98y@2G8dYs=eSHhq
zl>Zlgef1)6@dUP>nNMGFMKn3RX*u4+#B4ZkzJ$WD7del@Zw1uWp4m5VLPN5=ZOsdd
z%1v`L>|&SsAAfjAf|IfR=9A~_eLN036+-?j^<HP3#;|S%-!Hk<;g9?C-a5Zn`}Kpu
zfv1nwoja#<dfAcE($LV@TwS{tjSPR)|GT!dFJHbq*?6+@p+heg{&y@hEB2df(>YPc
zr7vP%iRKzXkIgJ!HgDcK^;xH3PS0W1Z_C`=+??CFQZGuZ+&Wp#K0ZF^{BwZ|Gv2*?
zIPpIB7C(-TfRg7g9v)8KvQIE~#!}VDIS*E?U*F%=Ba@b>STB{E>-)gLcI7pj{aKBB
z=gOuxJz3J6ZfYuie*Shz+gWncZfq@9x1MWL*t9|}J(>AtomDB<Q6Yg3szypp%%1i=
z+qb#~TWH61-P~L4@57VM#mCd~=knY+9vct&J#f%jpmb<ui^HeX9ZOaDGBPqI2rh3@
zurk`Tc<<g-n~H8<TN@DDcDv={<9=DoqCf5OYBz6t|L)X37Z4bycXIVPj<BdL5r=9Y
z9y+A%@4)@Ov$<+b6zf&N4X3B;A3uIv`IEks)Dx!%d-L8#^&L&HySQg_`nf0BrmarG
zKV2s<%$w0<u|4nZqa7_9Ev~H)RE{vVwvJY3sqvd>@$t~l&rTMlP9Ih+Zaz|Nug!ho
zsN@ktHQyNqm5*Ff`O8w%Qoe*f%Tj1qy-4H3w@+G{nu<yb7;J0Ua&I>28O%K4qIrQe
zwPumF3ZG!_43|9zxFeZretdcP>dl$6CnL8cG)nNl3@H7yw58$gg4HYBO(rc|zP;q*
zqc^|5C+5TpT;O+metvHA5~1DmIxg!SDt};6{%uXeCV!3wUZ(T&t-n8N<t{BPU1N9f
zT;87@g$?b;%1TNCbROzmk=|aO&99<R5for>`>bz{r<;StlD~7L#Y{BiDh@tcvCBZ{
z&O+&Pf&v?uy1YG~J$axY%GdV(#=f~KXE)V49%!C?q9%o1bZSNl<D-dtmgz{AI5ha(
z^YA&+5SIJ2dHoAdFE6FatRtIuRe3uwh)qgZw0Ke0eEaDF6QnMb`S~zAPMBnWuzre>
zjSi2rOLL4s_499U7YVuQ|KC+#e{65H5R<jEbV^5+jMGU2w`|33wzJ3F<_c_(eI~g7
ziN{F=Mn;>c=Px4z0vi6+E_A3{UaPP(L1#<->ROjvZlxu{CG*}+G+Cj&Rl(dme2J=*
zpks^&heDiJk&(|f1LMUD7Ca0}S644^`B1HJW4k}=!L_r^ySuwIY*UOb%iC1EdvkMp
zaIoOdeF_4t!igDoyXUrX1ROZ^>d42(f3EzuO>J1U=lI(Tjk<=S_nMf5JYqUZIVDf2
za5Cyl5IE2z#L6wvtQWJhrm}DL?2^6{(+|0-xw(Z*mh5t1V9Hxz!K|>tPC_Rw(ZDr5
zEN$8Re*btKh5hetZ1Y{QqvgPr3m^0k9yGmW@vA(3W`<VR92q?hzrMcWw6k5-B^-a3
z>ur)XW(#__eX4et#@j0y2hYrO;x_TrQ-0jMXv5VhD{^y140Z%ASilpq<pD?3gqbT_
z7+zTFmFh+I8U?m7FFaWKZ}-#FUrRF?xA$DO|KC%g`SyLMvb6LKN13nAE&d7)hbK**
zbYpgC0n@AAi7QvGyeDl|vptD5N_CYsr(<R0%<A=rCZFV&wQx`qXH?B(757+vM=BzK
zvr$V~L-B!Q!-*#bu2HGhWjgZ&3bYj!avq-BV_94kp}Z~NO6HGAHEYhK{&i&F^n9aK
zx>?|L(aHmpr?5?(I+bJLstnbj6<1x^(*A_7vu7=wt*JSMO;l7=!}8A(k=DbFjEpzd
zT+uRlbm3t09c5X&W``Kt2O^rB-%fr}bDSdJ5dCgz#fs%NkFPf}2et$%yPsN;kdp9V
zZ=LPoUqVOy6%HJpFyD)F^^OSvCl#Dd-C4J5*985IH@935mzmf!X|>{)hjAUN3VGR;
zvtD(6`*um9&|=#R`+T|beIIZAisEdHnbXq$OJjAuDhtnpZ+r9K$1UZWB&F$d(q(}{
zdL+O6Inm&2v;I0ZOcpc<VZWh~vy$~!WueBT`l2EupRjvPM*<s|XJ^jP`uyj4Ib%zh
z!ipw`HT}#UOAl9dhu>sjc_HG&{HVw=Z_YkDyC))CHkaC0D)pIceb&lt#jUbcCg_08
zRl7wRZ|vuG1P4_s$X`0C)xYurW8cDC+*`T$<_cs48Hw+^y4v)rR&tfJK*7Z151UlI
zQxwn4a?zVB6Rl#zRW>tB!mUkB#lD{3YQcYV-}su3$22GEUD98EknK?WXU^xF_h!@_
zf4GC=Sddh}rQ1D{$t%|9FIcWFU0<~E;hj?~#~2l!ZEax@PfveZk;1B;&&#*$$K=a9
z6$)FOcOE%;drM}MDeo3xOQGiSw>KJXRx16n|7+hgp>~s>UHHl$6-vey8YfO)E<U;`
zwOd@z<@|wpI^G3>^OrPi*<zBVTQqO~{Q2jP^=?`ym8hsFQn^Y-&+GC2xpsR`-jC-y
zR_DT^^yAyN01FxGswv)U=jg?GW}1EaIyL%;i~Hu*S5vRlzm3;i<L$&)&GqS27njJ4
zLz?>L(|>K*vSo_3g<{(sCHXr>aoe^P-I?Vt@7Hs_blsnz-(f+PGfuBq<-Vsa$T#P2
uiSoYg?mPcq?Dtgatohr1>-~eD;vYWEa?X6;HJyQhfx*+&&t;ucLK6TqmpZZl

diff --git a/src/plugins/qnx/images/qnxdevice.png b/src/plugins/qnx/images/qnxdevice.png
new file mode 100644
index 0000000000000000000000000000000000000000..fedd002bf7df873958296d1f38358ce1040849b1
GIT binary patch
literal 428
zcmeAS@N?(olHy`uVBq!ia0y~yU{C^K4h9AW26>$jIR*yCVow*x5R21iFMDgaFp3=e
zSYK?q*wD!Hu!)nHT&u{^H8~=xm1k~wMGD`YwCQr_DdmYdZ#*_SYPx!P%5k4^^30rY
z_DJfK=jl&Fw`ZS>{BQNVMDE4)2mdGDIC$;e&)M9OJde+QoV-;-W9Ni~BOmndm<Cn;
zbUgLvwEv~Lz?B@8pZr;)c&k2T_|>GH)SLdT_#{vFi#hr=ESF?NZ0bZ;c}dyS-t|;2
z@(Yp9e7WFh$l`{o-;>{5O|Rl@y1LTSW$9s#9?8a~F5FKy+DqK^W(dkUw?ybe=o_nv
z&J0y4(hO()QluIr*D_yt?sDs3w8aN4?w&vATKaTP&)QX%yIo%4&jYtt3_Jd~<=F_V
z*gMH-LQLtB?IjJ{-nU+3khmntAiK%;vdrB-7vC{3WY1zxxRhDq>yYB|ip{8M-qy^>
zYi}O&7fJWu_r6qXljj|z?a=(XZxdsa-xDd0Z8y3YFFbXb#xUbTXXdxQd}}#pc?Rvg
i??K%A9zFd3=iB?BB{Q!5Wm(=1iUv<tKbLh*2~7Y$Q@_ms

literal 0
HcmV?d00001

diff --git a/src/plugins/qnx/images/qnxdevice@2x.png b/src/plugins/qnx/images/qnxdevice@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0634693aa4ef703a8125fd9500be71aec8723769
GIT binary patch
literal 899
zcmeAS@N?(olHy`uVBq!ia0y~yU~mCp4h9AW2HA=;c?=B9UY;(FArXh)PK)&jaTGb8
z9)A1kACJqYqH;IaT=1E0;;1?GkHX<D6<?;e2OTs{$eFa<<KjBqx@42UCtt^tOSUYT
zAoP0a^i*%d;7MNIoQcNey4SDGefIj^&Rx3=Vrn#QRL+?B|Bj`7+Br+(a)y{@rauDq
zPxiO&IQGjb`V8;cT-$4^MhVWT^J=$v9`$@8f9ZQegtk*-Ow%ddAIe(0{LBQW9%Bf3
zJI^7@iuvocyYak|ylU5?jf%=&a-_9LH8qGyGR<#UX!Xl<%dtgfi|!{|n`T(-|IL2$
z+Ui?h8RjGlEXbUoSYRP%`YUSBvmb)~^HZ27?9<^lXP)57bNcIwRps6S7PAkV&G~t^
zJ2{wfg%Y1l&+<7;3Y`*VJT41%-BNX2u(`|NR9$6vA7=yCrO16t9HSW&W;#8Xz-X#I
zS14s+iv!oQJ&t^g0-rm}<deQP*042BKDk0SX~N6e9P8?R6^$m33gmKs^E~u<9cQEc
zZQWd_1-_q{Ti!nk5U#T2x*DxJPoP@v^n?P-NHYVDKe4A2RF1G|%XlAH6L-F+)Yf`-
zZqE_RMZG>&Wu|j)l?K?)RevPrXLebH?^4|y$MTxFve)<g*ZL8zsHrmLmM`nukoYBy
zeEz$0#M^E#Kk-?u%xt;Iuei&J?Z;iQ7YC*%aL8AvaAiI)OAvXvovSujB<N7?mkL!~
zE|2vZM-Jq!+PLnKmE#rl;5*9%^jXwS-?Gq=nyZ&3AQXSicirvzQHx3qTYbMo$SoIM
z#CNB7rT@0vPp3|WI;)A+{aYaR$$_zQl~~Yrt=>J3Vx=bG$z9b?>>2bX&V1(jl3jgj
zOuSv?;pZlaZ|`ZmR@(7NU`fqa)}3b+tvASpulZ+NXMQ1X!$XhPi_Y7u3{kPY_Ll2}
z_r>2T6K^j`u5HXd+oO=;cepp|ql4J>rHjm?_doiwa63y3*QBkPVIoDnku2giYPSw;
zxt5~#p2J<Cbo$3LJMvGwVbL`9_OV_uFD9WXATDBt>(|_R<~2Ujp%a8<gw{$49anS<
z?C5oi*}u1_<3)bgmDQrHHqT#Lca)l^Ke2RC4Bv6lan0+<l(K21J6r!BJu0&)@-6>e
z*|Ul(vlQh;>r7U+YP@UonjYoBTivEMukK;}=AVk$Oh37&uZ;QaRg{zh%3YqWelF{r
G5}E+eTaOF?

literal 0
HcmV?d00001

diff --git a/src/plugins/qnx/images/qnxdevicesmall.png b/src/plugins/qnx/images/qnxdevicesmall.png
new file mode 100644
index 0000000000000000000000000000000000000000..34a5ba9432c6df0cfa594593f292f27c2c2d0e55
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)Rq?DKSS43UszJ!q)i!pOk(
z;Cigm?Q~<0?GZdFUxanoW=^S3*cf9p=cfJy*GS38Ie8NuHM?7Xl^lNQF}L_t(Zu7Q
zSr`-;7!sGx*u5>}N}l5%AC<3(syEp`&hWW+M?JXw@TR}oRcFJlS8x9MOeOMPciqj0
zi)#|iSN0|8-`p@cC(?VX-nGe<t4}U+d_OzF<7t5I)#T;r{w}-Ue2%GmrSh1ciS6v_
z@adj<EOXQ^$Gaar^UULbqtP{1rfuCf*%TNU{@1E*(}-ZoJP7iUr>mdKI;Vst0K{Eo
A%>V!Z

literal 0
HcmV?d00001

diff --git a/src/plugins/qnx/images/qnxdevicesmall@2x.png b/src/plugins/qnx/images/qnxdevicesmall@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab2100c1e9bb03a95dc51e59dbc9dcce63be29ee
GIT binary patch
literal 445
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(3r7Ec$)5R22vKl~XCE_gcb
zT(Dq)*AZp~ZPpV({q=q84oqcaDf$2Re?CXr&BfXi7`csYe*d4&eJ0^o<EjVB$}R_&
z|1VeMSy#V;%g^8d&poC@*2R&A{5o1?AOHW?Gw^<Q?*ISoW$*9RzK{($`0mrEPq!-N
z8`khTgx!5~-XToHL-l*sorehwX5K&e^;qjI71vdAh82{2f46u0|Ar&{Z|?1V|1MtP
zF`vu4-})X0?c)TZzyA9F|Ne{vjNd-||9@71wKc)qrmf)6|Nr|L5>p-b9-jAycTIx0
z%Z*q6|34L&#vgEbrg8eZ`qs9?Djfx9{{Jr(2(ydINpou9|NCE_E6pIzE%*V4Q0i-@
zqLPDxhQcpS_iWj+<(G8;>+P_$QClDLc5G%maf_AfVs*meAMYOd1V$@voAx;50&k!|
z=duSH7ald;yx+LSrK8EpgjFEkiaAm&VcG?56IMlmTJZ+YU{BAJCXe~5HeGMixY4Q|
z|0k(=$qn}%A~Ed}6S|Dk-!et5$+`Z0_N_``hN_d-v{of?o&&{;r>mdKI;Vst074GR
A6aWAK

literal 0
HcmV?d00001

diff --git a/src/plugins/qnx/qnx.qrc b/src/plugins/qnx/qnx.qrc
index 97a16398cc7..7a7d425e8d2 100644
--- a/src/plugins/qnx/qnx.qrc
+++ b/src/plugins/qnx/qnx.qrc
@@ -1,5 +1,8 @@
 <RCC>
     <qresource prefix="/qnx">
-        <file>images/qnx-target.png</file>
+        <file>images/qnxdevice.png</file>
+        <file>images/qnxdevice@2x.png</file>
+        <file>images/qnxdevicesmall.png</file>
+        <file>images/qnxdevicesmall@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp
index 22718c63851..282e5980854 100644
--- a/src/plugins/qnx/qnxconfiguration.cpp
+++ b/src/plugins/qnx/qnxconfiguration.cpp
@@ -320,7 +320,6 @@ ProjectExplorer::Kit *QnxConfiguration::createKit(
                     "Kit for %1 (%2)")
                 .arg(displayName())
                 .arg(target.shortDescription()));
-    kit->setIconPath(FileName::fromString(QLatin1String(Constants::QNX_CATEGORY_ICON)));
 
     kit->setAutoDetected(true);
     kit->setAutoDetectionSource(envFile().toString());
diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h
index 979aa1e94e8..63d9a2d50b4 100644
--- a/src/plugins/qnx/qnxconstants.h
+++ b/src/plugins/qnx/qnxconstants.h
@@ -48,7 +48,6 @@ const char QNX_DEBUG_EXECUTABLE[] = "pdebug";
 const char QNX_TOOLCHAIN_ID[] = "Qnx.QccToolChain";
 
 // QNX settings constants
-const char QNX_CATEGORY_ICON[] = ":/qnx/images/qnx-target.png";
 const char QNX_SETTINGS_ID[] = "DD.Qnx Configuration";
 
 const char QNX_CONFIGS_FILENAME[] = "qnxconfigurations.xml";
diff --git a/src/plugins/qnx/qnxdevicefactory.cpp b/src/plugins/qnx/qnxdevicefactory.cpp
index f489c10d740..1546171afd7 100644
--- a/src/plugins/qnx/qnxdevicefactory.cpp
+++ b/src/plugins/qnx/qnxdevicefactory.cpp
@@ -30,6 +30,7 @@
 #include "qnxdevice.h"
 
 #include <utils/qtcassert.h>
+#include <utils/icon.h>
 
 #include <QIcon>
 
@@ -55,7 +56,13 @@ QList<Core::Id> QnxDeviceFactory::availableCreationIds() const
 QIcon QnxDeviceFactory::iconForId(Core::Id type) const
 {
     Q_UNUSED(type)
-    return QIcon();
+    using namespace Utils;
+    static const QIcon icon =
+            Icon::combinedIcon({Icon({{":/qnx/images/qnxdevicesmall.png",
+                                       Theme::PanelTextColorDark}}, Icon::Tint),
+                                Icon({{":/qnx/images/qnxdevice.png",
+                                       Theme::IconsBaseColor}})});
+    return icon;
 }
 
 bool QnxDeviceFactory::canCreate() const
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index d27d37665e1..297f6aaff18 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -8637,6 +8637,49 @@
          width="100%"
          height="100%" />
     </g>
+    <g
+       transform="translate(-103.75,310.5)"
+       id="src/plugins/qnx/images/qnxdevice">
+      <use
+         transform="translate(458.75,5.5)"
+         style="display:inline"
+         x="0"
+         y="0"
+         xlink:href="#backgroundRect_32_28"
+         id="use5913-0-8-1-5-6-8-74-5-1"
+         width="100%"
+         height="100%" />
+      <path
+         id="blackberry"
+         d="m 515.06297,73.5 h -3.15014 l 0.85972,-4 h 3.02638 c 1.96151,0 2.4261,1.015671 2.4261,1.774073 0,1.070118 -0.69797,2.225927 -3.16206,2.225927 m 8.5136,-2.5 h -3.14687 l 0.85972,-4 h 3.01986 c 1.9626,0 2.4272,1.116222 2.4272,1.868193 C 526.73648,69.942592 526.0385,71 523.57657,71 M 524.75,65 h -3.14796 l 0.85972,-4 h 3.02313 c 1.95933,0 2.4261,0.940839 2.4261,1.69602 0,1.071189 -0.70123,2.30398 -3.16099,2.30398 m -8.51252,2.577828 h -3.15556 L 513.94164,63.5 h 3.02855 c 1.95826,0 2.42502,0.843508 2.42502,1.6019 0,1.070119 -0.69907,2.475928 -3.15773,2.475928 m -8.14671,0 h -3.14796 L 505.80035,63.5 h 3.02205 c 1.96259,0 2.42936,0.843508 2.42936,1.6019 0,1.070119 -0.70015,2.475928 -3.16099,2.475928 M 517.32516,61.5 h -3.15123 l 0.85864,-4 h 3.02855 c 1.95934,0 2.42285,0.917706 2.42285,1.672896 0,1.071189 -0.69906,2.327104 -3.15881,2.327104 m -8.14237,0 h -3.14905 l 0.85972,-4 h 3.01879 c 1.96368,0 2.43153,0.917706 2.43153,1.672896 0,1.071189 -0.70124,2.327104 -3.16099,2.327104"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccssccccssccccssccccssccccssccccssccccssc" />
+      <path
+         id="path3909-9"
+         d="m 521.75,54.500748 v -4.981742 l 2.95707,2.459226 z M 511.18081,52.065359 510.83284,51.5 h -2.78812 l 2.03148,1.617477 c -0.49426,0.153392 -1.12523,0.430859 -1.70723,0.430859 -0.71452,0 -1.92399,-0.321794 -2.38436,-0.578386 -0.44254,-0.247107 -0.44462,-0.651625 -0.44462,-1.022467 0,-0.370476 7.9e-4,-0.847848 0.44462,-1.094219 0.46037,-0.256625 1.67019,-0.500015 2.38436,-0.500015 0.71381,0 1.91697,0.257662 2.38435,0.500015 0.48868,0.253328 0.42749,1.212098 0.42749,1.212098 M 530.25,49.481268 h -2.62516 l -1.60552,1.351125 -1.60487,-1.351125 H 519.75 v 3.382879 l -3.6299,-3.382879 -2.3701,-2.74e-4 v 4.132984 l -1.19187,-0.506386 c 0.11364,-0.389513 0.11671,-0.813799 0.11671,-1.160112 0,-0.662977 -0.003,-1.685442 -0.79489,-2.126935 -0.82355,-0.458699 -2.23406,-0.56523 -3.51098,-0.56523 -1.27696,0 -2.91534,0.106531 -3.73927,0.56523 -0.79209,0.441493 -0.79455,1.463958 -0.79455,2.126935 0,0.662974 0.004,1.614423 0.79455,2.054816 0.82428,0.460535 2.46128,0.522414 3.73927,0.522414 1.07454,0 2.40078,-0.03221 3.28657,-0.329489 l 0.4964,0.304032 h 3.26835 v -3.40328 l 3.82072,3.40328 h 5.18083 l 1.59748,-1.375555 1.59786,1.375555 h 2.62516 l -2.91041,-2.521021 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccscscsccccccccccccscscscsccccccccccc" />
+    </g>
+    <g
+       id="src/plugins/qnx/images/qnxdevicesmall"
+       transform="translate(-174,27)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#backgroundRect"
+         id="use6054-1-3"
+         width="100%"
+         height="100%"
+         transform="translate(586,-73)" />
+      <use
+         transform="matrix(0.60951707,0,0,0.80579423,263.28972,318.71157)"
+         x="0"
+         y="0"
+         xlink:href="#blackberry"
+         id="use1449"
+         width="100%"
+         height="100%" />
+    </g>
     <g
        id="src/plugins/winrt/images/winrtdevice"
        transform="translate(-206,-74)">

From d0f59c0949225c55d54963ac350a2d73bd9a9bbc Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Mon, 25 Sep 2017 14:55:30 +0200
Subject: [PATCH 21/41] CppEditor: Clean forward declaration

Change-Id: Id2a4d203e7a0c3405ca612aeb294b25be8a37323
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/cppeditor/cppeditorplugin.h     | 2 --
 src/plugins/cppeditor/cppelementevaluator.h | 1 -
 src/plugins/cppeditor/cpphighlighter.h      | 1 -
 src/plugins/cppeditor/cpptypehierarchy.h    | 4 ----
 4 files changed, 8 deletions(-)

diff --git a/src/plugins/cppeditor/cppeditorplugin.h b/src/plugins/cppeditor/cppeditorplugin.h
index aa2f06fad76..c1d86a61591 100644
--- a/src/plugins/cppeditor/cppeditorplugin.h
+++ b/src/plugins/cppeditor/cppeditorplugin.h
@@ -37,9 +37,7 @@ namespace TextEditor { class BaseTextEditor; }
 namespace CppEditor {
 namespace Internal {
 
-class CppEditorWidget;
 class CppCodeModelInspectorDialog;
-class CppQuickFixCollector;
 class CppQuickFixAssistProvider;
 
 class CppEditorPlugin : public ExtensionSystem::IPlugin
diff --git a/src/plugins/cppeditor/cppelementevaluator.h b/src/plugins/cppeditor/cppelementevaluator.h
index ffc6bd760a1..5af04956aee 100644
--- a/src/plugins/cppeditor/cppelementevaluator.h
+++ b/src/plugins/cppeditor/cppelementevaluator.h
@@ -46,7 +46,6 @@ namespace CppTools { class CppModelManager; }
 namespace CppEditor {
 namespace Internal {
 
-class CppEditorWidget;
 class CppElement;
 
 class CppElementEvaluator
diff --git a/src/plugins/cppeditor/cpphighlighter.h b/src/plugins/cppeditor/cpphighlighter.h
index 536ea30b6c9..2e4b870b048 100644
--- a/src/plugins/cppeditor/cpphighlighter.h
+++ b/src/plugins/cppeditor/cpphighlighter.h
@@ -35,7 +35,6 @@ namespace CppEditor {
 
 namespace Internal {
 
-class CppEditorWidget;
 
 class CppHighlighter : public TextEditor::SyntaxHighlighter
 {
diff --git a/src/plugins/cppeditor/cpptypehierarchy.h b/src/plugins/cppeditor/cpptypehierarchy.h
index 125fb58338c..355f87065d9 100644
--- a/src/plugins/cppeditor/cpptypehierarchy.h
+++ b/src/plugins/cppeditor/cpptypehierarchy.h
@@ -37,12 +37,9 @@ class QLabel;
 class QModelIndex;
 class QStackedLayout;
 class QStandardItem;
-template <class> class QVector;
 template <class> class QList;
 QT_END_NAMESPACE
 
-namespace Core { class IEditor; }
-
 namespace TextEditor { class TextEditorLinkLabel; }
 
 namespace Utils {
@@ -55,7 +52,6 @@ namespace Internal {
 
 class CppEditorWidget;
 class CppClass;
-class CppClassLabel;
 
 class CppTypeHierarchyModel : public QStandardItemModel
 {

From 576ae5e132c84877361b715f3a12af500c2c0c32 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Mon, 25 Sep 2017 13:46:30 +0200
Subject: [PATCH 22/41] Clang: Remove test testUpdateBackendAfterRestart()

* It's skipped / must be rewritten.
* It does not belong to ClangCodeCompletionTest

Change-Id: If6708d28602cc8c3478a968b87bae542ae859590
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../test/clangcodecompletion_test.cpp         | 345 ------------------
 .../test/clangcodecompletion_test.h           |   2 -
 2 files changed, 347 deletions(-)

diff --git a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
index 7a5e0446d8e..9165ccca29c 100644
--- a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
+++ b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
@@ -26,7 +26,6 @@
 #include "clangcodecompletion_test.h"
 
 #include "clangautomationutils.h"
-#include "../clangbackendipcintegration.h"
 #include "../clangcompletionassistinterface.h"
 #include "../clangmodelmanagersupport.h"
 
@@ -61,9 +60,6 @@ namespace {
 QString qrcPath(const QByteArray relativeFilePath)
 { return QLatin1String(":/unittests/ClangCodeModel/") + QString::fromUtf8(relativeFilePath); }
 
-QString fileName(const QString &filePath)
-{ return QFileInfo(filePath).fileName(); }
-
 CppTools::Tests::TemporaryDir *globalTemporaryDir()
 {
     static CppTools::Tests::TemporaryDir dir;
@@ -71,77 +67,6 @@ CppTools::Tests::TemporaryDir *globalTemporaryDir()
     return &dir;
 }
 
-struct LogOutput
-{
-    LogOutput(const QString &text) : text(text.toUtf8()) {}
-    LogOutput(const char text[]) : text(text) {}
-    QByteArray text;
-};
-
-void printRawLines(QTextStream &out, const QList<QByteArray> &lines)
-{
-    foreach (const QByteArray &line, lines) {
-        QByteArray rawLine = line;
-        rawLine.prepend("\"");
-        rawLine.append("\\n\"\n");
-        out << rawLine;
-    }
-}
-
-void printDifference(const LogOutput &actual, const LogOutput &expected)
-{
-    QTextStream out(stderr);
-
-    const QList<QByteArray> actualLines = actual.text.split('\n');
-    const QList<QByteArray> expectedLines = expected.text.split('\n');
-
-    out << "-- ACTUAL:\n";
-    printRawLines(out, actualLines);
-    out << "-- EXPECTED:\n";
-    printRawLines(out, expectedLines);
-
-    if (actualLines.size() != expectedLines.size()) {
-        out << "-- DIFFERENCE IN LINE COUNT:\n"
-            << "    actual lines:" << actualLines.size() << '\n'
-            << "  expected lines:" << expectedLines.size() << '\n';
-    }
-
-    out << "-- FIRST LINE THAT DIFFERS:\n";
-    auto actualLineIt = actualLines.cbegin();
-    auto expectedLineIt = expectedLines.cbegin();
-    int line = 1;
-    forever {
-        if (actualLineIt == actualLines.cend() && expectedLineIt != expectedLines.cend()) {
-            out << "      line: " << line << '\n';
-            out << "    actual: <none>\n";
-            out << "  expected: \"" << *expectedLineIt << "\"\n";
-        } else if (actualLineIt != actualLines.cend() && expectedLineIt == expectedLines.cend()) {
-            out << "      line: " << line << '\n';
-            out << "    actual: \"" << *actualLineIt << "\"\n";
-            out << "  expected: <none>\n";
-        } else {
-            if (*actualLineIt != *expectedLineIt) {
-                out << "      line: " << line << '\n';
-                out << "    actual: \"" << *actualLineIt << "\"\n";
-                out << "  expected: \"" << *expectedLineIt << "\"\n";
-                return;
-            }
-        }
-
-        ++line;
-        ++actualLineIt;
-        ++expectedLineIt;
-    }
-}
-
-bool compare(const LogOutput &actual, const LogOutput &expected)
-{
-    const bool isEqual = actual.text == expected.text;
-    if (!isEqual)
-        printDifference(actual, expected);
-    return isEqual;
-}
-
 QByteArray readFile(const QString &filePath)
 {
     QFile file(filePath);
@@ -186,197 +111,6 @@ private:
    Core::IDocument::ReloadSetting m_previousValue;
 };
 
-class ChangeIpcSender
-{
-public:
-    ChangeIpcSender(IpcSenderInterface *ipcSender)
-    {
-        auto &ipc = ModelManagerSupportClang::instance()->ipcCommunicator();
-        m_previousSender = ipc.setIpcSender(ipcSender);
-    }
-
-    ~ChangeIpcSender()
-    {
-        auto &ipc = ModelManagerSupportClang::instance()->ipcCommunicator();
-        ipc.setIpcSender(m_previousSender);
-    }
-
-private:
-    IpcSenderInterface *m_previousSender;
-};
-
-QString toString(const FileContainer &fileContainer)
-{
-    QString out;
-    QTextStream ts(&out);
-    ts << "  Path: " << fileName(fileContainer.filePath().toString())
-       << " ProjectPart: " << fileName(fileContainer.projectPartId().toString()) << "\n";
-    return out;
-}
-
-QString toString(const QVector<FileContainer> &fileContainers)
-{
-    QString out;
-    QTextStream ts(&out);
-    foreach (const FileContainer &fileContainer, fileContainers)
-        ts << toString(fileContainer);
-    return out;
-}
-
-QString toString(const ProjectPartContainer &projectPartContainer)
-{
-    QString out;
-    QTextStream ts(&out);
-    ts << "  ProjectPartContainer"
-       << " id: " << fileName(projectPartContainer.projectPartId().toString());
-    return out;
-}
-
-QString toString(const QVector<ProjectPartContainer> &projectPartContainers)
-{
-    QString out;
-    QTextStream ts(&out);
-    foreach (const ProjectPartContainer &projectPartContainer, projectPartContainers)
-        ts << toString(projectPartContainer);
-    return out;
-}
-
-QString toString(const EndMessage &)
-{
-    return QLatin1String("EndMessage\n");
-}
-
-QString toString(const RegisterTranslationUnitForEditorMessage &message)
-{
-    QString out;
-    QTextStream ts(&out);
-
-    ts << "RegisterTranslationUnitForEditorMessage\n"
-       << toString(message.fileContainers());
-    return out;
-}
-
-QString toString(const UpdateTranslationUnitsForEditorMessage &message)
-{
-    QString out;
-    QTextStream ts(&out);
-
-    ts << "UpdateTranslationUnitForEditorMessage\n"
-       << toString(message.fileContainers());
-    return out;
-}
-
-QString toString(const UnregisterTranslationUnitsForEditorMessage &)
-{
-    return QLatin1String("UnregisterTranslationUnitsForEditorMessage\n");
-}
-
-QString toString(const RegisterProjectPartsForEditorMessage &message)
-{
-    QString out;
-    QTextStream ts(&out);
-
-    ts << "RegisterProjectPartsForEditorMessage\n"
-       << toString(message.projectContainers()) << "\n";
-    return out;
-}
-
-QString toString(const UnregisterProjectPartsForEditorMessage &message)
-{
-    QString out;
-    QTextStream ts(&out);
-
-    ts << "UnregisterProjectPartsForEditorMessage\n"
-       << message.projectPartIds().join(Utf8String::fromUtf8(",")).toByteArray() << "\n";
-    return out;
-}
-
-QString toString(const RegisterUnsavedFilesForEditorMessage &message)
-{
-    QString out;
-    QTextStream ts(&out);
-
-    ts << "RegisterUnsavedFilesForEditorMessage\n"
-       << toString(message.fileContainers());
-    return out;
-}
-
-QString toString(const UnregisterUnsavedFilesForEditorMessage &)
-{
-    return QLatin1String("UnregisterUnsavedFilesForEditorMessage\n");
-}
-
-QString toString(const CompleteCodeMessage &)
-{
-    return QLatin1String("CompleteCodeMessage\n");
-}
-
-QString toString(const RequestDocumentAnnotationsMessage &)
-{
-    return QStringLiteral("RequestDocumentAnnotationsMessage\n");
-}
-
-QString toString(const RequestReferencesMessage &)
-{
-    return QStringLiteral("RequestReferencesMessage\n");
-}
-
-QString toString(const RequestFollowSymbolMessage &)
-{
-    return QStringLiteral("RequestFollowSymbolMessage\n");
-}
-
-QString toString(const UpdateVisibleTranslationUnitsMessage &)
-{
-    return QStringLiteral("UpdateVisibleTranslationUnitsMessage\n");
-}
-
-class IpcSenderSpy : public IpcSenderInterface
-{
-public:
-    void end() override
-    { senderLog.append(toString(EndMessage())); }
-
-    void registerTranslationUnitsForEditor(const RegisterTranslationUnitForEditorMessage &message) override
-    { senderLog.append(toString(message)); }
-
-    void updateTranslationUnitsForEditor(const UpdateTranslationUnitsForEditorMessage &message) override
-    { senderLog.append(toString(message)); }
-
-    void unregisterTranslationUnitsForEditor(const UnregisterTranslationUnitsForEditorMessage &message) override
-    { senderLog.append(toString(message)); }
-
-    void registerProjectPartsForEditor(const RegisterProjectPartsForEditorMessage &message) override
-    { senderLog.append(toString(message)); }
-
-    void unregisterProjectPartsForEditor(const UnregisterProjectPartsForEditorMessage &message) override
-    { senderLog.append(toString(message)); }
-
-    void registerUnsavedFilesForEditor(const RegisterUnsavedFilesForEditorMessage &message) override
-    { senderLog.append(toString(message)); }
-
-    void unregisterUnsavedFilesForEditor(const UnregisterUnsavedFilesForEditorMessage &message) override
-    { senderLog.append(toString(message)); }
-
-    void completeCode(const CompleteCodeMessage &message) override
-    { senderLog.append(toString(message)); }
-
-    void requestDocumentAnnotations(const RequestDocumentAnnotationsMessage &message) override
-    { senderLog.append(toString(message)); }
-
-    void requestReferences(const RequestReferencesMessage &message) override
-    { senderLog.append(toString(message)); }
-
-    void requestFollowSymbol(const RequestFollowSymbolMessage &message) override
-    { senderLog.append(toString(message)); }
-
-    void updateVisibleTranslationUnits(const UpdateVisibleTranslationUnitsMessage &message) override
-    { senderLog.append(toString(message)); }
-
-public:
-    QString senderLog;
-};
-
 class TestDocument
 {
 public:
@@ -1060,85 +794,6 @@ void ClangCodeCompletionTest::testCompleteAfterChangingIncludedAndNotOpenHeaderE
     QVERIFY(hasItem(proposal, "globalFromHeaderReloaded"));
 }
 
-void ClangCodeCompletionTest::testUpdateBackendAfterRestart()
-{
-    QSKIP("Must be rewritten with a more robust approach instead of sender log!");
-    IpcSenderSpy spy;
-    ChangeIpcSender changeIpcSender(&spy);
-
-    CppTools::Tests::TemporaryCopiedDir testDir(qrcPath("qt-widgets-app"));
-    QVERIFY(testDir.isValid());
-
-    // Open file not part of any project...
-    const TestDocument headerDocument("myheader.h", &testDir);
-    QVERIFY(headerDocument.isCreated());
-    OpenEditorAtCursorPosition openHeader(headerDocument);
-    QVERIFY(openHeader.succeeded());
-    // ... and modify it, so we have an unsaved file.
-    insertTextAtTopOfEditor(openHeader.editor(), "int someGlobal;\n");
-    // Open project ...
-    MonitorGeneratedUiFile monitorGeneratedUiFile;
-    const QString projectFilePath = testDir.absolutePath("qt-widgets-app.pro");
-    CppTools::Tests::ProjectOpenerAndCloser projectManager;
-    const CppTools::ProjectInfo projectInfo = projectManager.open(projectFilePath, true);
-    QVERIFY(projectInfo.isValid());
-    QVERIFY(monitorGeneratedUiFile.waitUntilGenerated());
-    // ...and a file of the project
-    const QString completionFile = testDir.absolutePath("mainwindow.cpp");
-    const TestDocument testDocument = TestDocument::fromExistingFile(completionFile);
-    QVERIFY(testDocument.isCreatedAndHasValidCursorPosition());
-    OpenEditorAtCursorPosition openSource(testDocument);
-    QVERIFY(openSource.succeeded());
-
-    // Check messages that would have been sent
-    QVERIFY(compare(LogOutput(spy.senderLog),
-                    LogOutput(
-                        "RegisterTranslationUnitForEditorMessage\n"
-                        "  Path: myheader.h ProjectPart: \n"
-                        "RegisterTranslationUnitForEditorMessage\n"
-                        "  Path: myheader.h ProjectPart: \n"
-                        "RequestDiagnosticsMessage\n"
-                        "  ProjectPartContainer id: qt-widgets-app.pro qt-widgets-app\n"
-                        "RegisterTranslationUnitForEditorMessage\n"
-                        "  Path: myheader.h ProjectPart: \n"
-                        "RequestDiagnosticsMessage\n"
-                        "RegisterTranslationUnitForEditorMessage\n"
-                        "  Path: myheader.h ProjectPart: \n"
-                        "RequestDiagnosticsMessage\n"
-                        "RegisterTranslationUnitForEditorMessage\n"
-                        "  Path: ui_mainwindow.h ProjectPart: \n"
-                        "RegisterTranslationUnitForEditorMessage\n"
-                        "  Path: myheader.h ProjectPart: \n"
-                        "RegisterTranslationUnitForEditorMessage\n"
-                        "  Path: mainwindow.cpp ProjectPart: qt-widgets-app.pro qt-widgets-app\n"
-                        "RegisterTranslationUnitForEditorMessage\n"
-                        "  Path: mainwindow.cpp ProjectPart: qt-widgets-app.pro qt-widgets-app\n"
-                        "RequestDiagnosticsMessage\n"
-
-                    )));
-    spy.senderLog.clear();
-
-    // Kill backend process...
-    auto &ipcCommunicator = ModelManagerSupportClang::instance()->ipcCommunicator();
-    ipcCommunicator.killBackendProcess();
-    QSignalSpy waitForReinitializedBackend(&ipcCommunicator,
-                                           SIGNAL(backendReinitialized()));
-    QVERIFY(waitForReinitializedBackend.wait());
-
-    // ...and check if code model backend would have been provided with current data
-    QVERIFY(compare(LogOutput(spy.senderLog),
-                    LogOutput(
-                        "RegisterProjectPartsForEditorMessage\n"
-                        "  ProjectPartContainer id: \n"
-                        "RegisterProjectPartsForEditorMessage\n"
-                        "  ProjectPartContainer id: qt-widgets-app.pro qt-widgets-app\n"
-                        "RegisterTranslationUnitForEditorMessage\n"
-                        "  Path: myheader.h ProjectPart: \n"
-                        "RegisterTranslationUnitForEditorMessage\n"
-                        "  Path: ui_mainwindow.h ProjectPart: \n"
-                    )));
-}
-
 } // namespace Tests
 } // namespace Internal
 } // namespace ClangCodeModel
diff --git a/src/plugins/clangcodemodel/test/clangcodecompletion_test.h b/src/plugins/clangcodemodel/test/clangcodecompletion_test.h
index 24b36da4f0d..b2659d064d5 100644
--- a/src/plugins/clangcodemodel/test/clangcodecompletion_test.h
+++ b/src/plugins/clangcodemodel/test/clangcodecompletion_test.h
@@ -58,8 +58,6 @@ private slots:
     void testCompleteAfterModifyingIncludedHeaderByRefactoringActions();
     void testCompleteAfterChangingIncludedAndOpenHeaderExternally();
     void testCompleteAfterChangingIncludedAndNotOpenHeaderExternally();
-
-    void testUpdateBackendAfterRestart();
 };
 
 } // namespace Tests

From e99b86e8ca1473acf45c50c35c68dd57318f3462 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Mon, 25 Sep 2017 14:00:24 +0200
Subject: [PATCH 23/41] Clang: Remove IpcSenderInterface

Change-Id: I005ab86d0967b439421a217556a39f2416976f20
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../clangbackendipcintegration.cpp            | 98 ++++++++-----------
 .../clangbackendipcintegration.h              | 40 ++++----
 2 files changed, 65 insertions(+), 73 deletions(-)

diff --git a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
index ff1cf8f0750..8a953af9c32 100644
--- a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
+++ b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
@@ -313,125 +313,111 @@ void IpcReceiver::followSymbol(const ClangBackEnd::FollowSymbolMessage &message)
     futureInterface.reportFinished();
 }
 
-class IpcSender : public IpcSenderInterface
-{
-public:
-    IpcSender(ClangBackEnd::ClangCodeModelConnectionClient &connectionClient)
-        : m_connection(connectionClient)
-    {}
-
-    void end() override;
-    void registerTranslationUnitsForEditor(const ClangBackEnd::RegisterTranslationUnitForEditorMessage &message) override;
-    void updateTranslationUnitsForEditor(const ClangBackEnd::UpdateTranslationUnitsForEditorMessage &message) override;
-    void unregisterTranslationUnitsForEditor(const ClangBackEnd::UnregisterTranslationUnitsForEditorMessage &message) override;
-    void registerProjectPartsForEditor(const ClangBackEnd::RegisterProjectPartsForEditorMessage &message) override;
-    void unregisterProjectPartsForEditor(const ClangBackEnd::UnregisterProjectPartsForEditorMessage &message) override;
-    void registerUnsavedFilesForEditor(const ClangBackEnd::RegisterUnsavedFilesForEditorMessage &message) override;
-    void unregisterUnsavedFilesForEditor(const ClangBackEnd::UnregisterUnsavedFilesForEditorMessage &message) override;
-    void completeCode(const ClangBackEnd::CompleteCodeMessage &message) override;
-    void requestDocumentAnnotations(const ClangBackEnd::RequestDocumentAnnotationsMessage &message) override;
-    void requestReferences(const ClangBackEnd::RequestReferencesMessage &message) override;
-    void requestFollowSymbol(const ClangBackEnd::RequestFollowSymbolMessage &message) override;
-    void updateVisibleTranslationUnits(const UpdateVisibleTranslationUnitsMessage &message) override;
-
-private:
-    ClangBackEnd::ClangCodeModelConnectionClient &m_connection;
-};
+IpcSender::IpcSender(ClangCodeModelConnectionClient *connectionClient)
+    : m_connection(connectionClient)
+{}
 
 void IpcSender::end()
 {
-     QTC_CHECK(m_connection.isConnected());
-     qCDebug(log) << ">>>" << ClangBackEnd::EndMessage();
-     m_connection.sendEndMessage();
+    QTC_CHECK(m_connection->isConnected());
+    qCDebug(log) << ">>>" << ClangBackEnd::EndMessage();
+     m_connection->sendEndMessage();
 }
 
 void IpcSender::registerTranslationUnitsForEditor(const RegisterTranslationUnitForEditorMessage &message)
 {
-     QTC_CHECK(m_connection.isConnected());
+     QTC_CHECK(m_connection->isConnected());
      qCDebug(log) << ">>>" << message;
-     m_connection.serverProxy().registerTranslationUnitsForEditor(message);
+     m_connection->serverProxy().registerTranslationUnitsForEditor(message);
 }
 
 void IpcSender::updateTranslationUnitsForEditor(const UpdateTranslationUnitsForEditorMessage &message)
 {
-    QTC_CHECK(m_connection.isConnected());
+    QTC_CHECK(m_connection->isConnected());
     qCDebug(log) << ">>>" << message;
-    m_connection.serverProxy().updateTranslationUnitsForEditor(message);
+    m_connection->serverProxy().updateTranslationUnitsForEditor(message);
 }
 
 void IpcSender::unregisterTranslationUnitsForEditor(const UnregisterTranslationUnitsForEditorMessage &message)
 {
-     QTC_CHECK(m_connection.isConnected());
+     QTC_CHECK(m_connection->isConnected());
      qCDebug(log) << ">>>" << message;
-     m_connection.serverProxy().unregisterTranslationUnitsForEditor(message);
+     m_connection->serverProxy().unregisterTranslationUnitsForEditor(message);
 }
 
 void IpcSender::registerProjectPartsForEditor(const RegisterProjectPartsForEditorMessage &message)
 {
-     QTC_CHECK(m_connection.isConnected());
+     QTC_CHECK(m_connection->isConnected());
      qCDebug(log) << ">>>" << message;
-     m_connection.serverProxy().registerProjectPartsForEditor(message);
+     m_connection->serverProxy().registerProjectPartsForEditor(message);
 }
 
 void IpcSender::unregisterProjectPartsForEditor(const UnregisterProjectPartsForEditorMessage &message)
 {
-     QTC_CHECK(m_connection.isConnected());
+     QTC_CHECK(m_connection->isConnected());
      qCDebug(log) << ">>>" << message;
-     m_connection.serverProxy().unregisterProjectPartsForEditor(message);
+     m_connection->serverProxy().unregisterProjectPartsForEditor(message);
 }
 
 void IpcSender::registerUnsavedFilesForEditor(const RegisterUnsavedFilesForEditorMessage &message)
 {
-    QTC_CHECK(m_connection.isConnected());
+    QTC_CHECK(m_connection->isConnected());
     qCDebug(log) << ">>>" << message;
-    m_connection.serverProxy().registerUnsavedFilesForEditor(message);
+    m_connection->serverProxy().registerUnsavedFilesForEditor(message);
 }
 
 void IpcSender::unregisterUnsavedFilesForEditor(const UnregisterUnsavedFilesForEditorMessage &message)
 {
-    QTC_CHECK(m_connection.isConnected());
+    QTC_CHECK(m_connection->isConnected());
     qCDebug(log) << ">>>" << message;
-    m_connection.serverProxy().unregisterUnsavedFilesForEditor(message);
+    m_connection->serverProxy().unregisterUnsavedFilesForEditor(message);
 }
 
 void IpcSender::completeCode(const CompleteCodeMessage &message)
 {
-     QTC_CHECK(m_connection.isConnected());
+     QTC_CHECK(m_connection->isConnected());
      qCDebug(log) << ">>>" << message;
-     m_connection.serverProxy().completeCode(message);
+     m_connection->serverProxy().completeCode(message);
 }
 
 void IpcSender::requestDocumentAnnotations(const RequestDocumentAnnotationsMessage &message)
 {
-    QTC_CHECK(m_connection.isConnected());
+    QTC_CHECK(m_connection->isConnected());
     qCDebug(log) << ">>>" << message;
-    m_connection.serverProxy().requestDocumentAnnotations(message);
+    m_connection->serverProxy().requestDocumentAnnotations(message);
 }
 
 void IpcSender::requestReferences(const RequestReferencesMessage &message)
 {
-    QTC_CHECK(m_connection.isConnected());
+    QTC_CHECK(m_connection->isConnected());
     qCDebug(log) << ">>>" << message;
-    m_connection.serverProxy().requestReferences(message);
+    m_connection->serverProxy().requestReferences(message);
 }
 
 void IpcSender::requestFollowSymbol(const RequestFollowSymbolMessage &message)
 {
-    QTC_CHECK(m_connection.isConnected());
+    QTC_CHECK(m_connection->isConnected());
     qCDebug(log) << ">>>" << message;
-    m_connection.serverProxy().requestFollowSymbol(message);
+    m_connection->serverProxy().requestFollowSymbol(message);
 }
 
 void IpcSender::updateVisibleTranslationUnits(const UpdateVisibleTranslationUnitsMessage &message)
 {
-    QTC_CHECK(m_connection.isConnected());
+    QTC_CHECK(m_connection->isConnected());
     qCDebug(log) << ">>>" << message;
-    m_connection.serverProxy().updateVisibleTranslationUnits(message);
+    m_connection->serverProxy().updateVisibleTranslationUnits(message);
 }
 
-class DummyIpcSender : public IpcSenderInterface
+bool IpcSender::isConnected() const
+{
+    return m_connection && m_connection->isConnected();
+}
+
+class DummyIpcSender : public IpcSender
 {
 public:
+    DummyIpcSender() : IpcSender(nullptr) {}
+
     void end() override {}
     void registerTranslationUnitsForEditor(const ClangBackEnd::RegisterTranslationUnitForEditorMessage &) override {}
     void updateTranslationUnitsForEditor(const ClangBackEnd::UpdateTranslationUnitsForEditorMessage &) override {}
@@ -451,7 +437,7 @@ enum { backEndStartTimeOutInMs = 10000 };
 
 IpcCommunicator::IpcCommunicator()
     : m_connection(&m_ipcReceiver)
-    , m_ipcSender(new DummyIpcSender)
+    , m_ipcSender(new DummyIpcSender())
 {
     m_backendStartTimeOut.setSingleShot(true);
     connect(&m_backendStartTimeOut, &QTimer::timeout,
@@ -804,7 +790,7 @@ void IpcCommunicator::onConnectedToBackend()
         logRestartedDueToUnexpectedFinish();
 
     m_ipcReceiver.reset();
-    m_ipcSender.reset(new IpcSender(m_connection));
+    m_ipcSender.reset(new IpcSender(&m_connection));
 
     initializeBackendWithCurrentData();
 }
@@ -869,9 +855,9 @@ void IpcCommunicator::initializeBackendWithCurrentData()
     emit backendReinitialized();
 }
 
-IpcSenderInterface *IpcCommunicator::setIpcSender(IpcSenderInterface *ipcSender)
+IpcSender *IpcCommunicator::setIpcSender(IpcSender *ipcSender)
 {
-    IpcSenderInterface *previousMessageSender = m_ipcSender.take();
+    IpcSender *previousMessageSender = m_ipcSender.take();
     m_ipcSender.reset(ipcSender);
     return previousMessageSender;
 }
diff --git a/src/plugins/clangcodemodel/clangbackendipcintegration.h b/src/plugins/clangcodemodel/clangbackendipcintegration.h
index 589c0357818..5c7eb6f9225 100644
--- a/src/plugins/clangcodemodel/clangbackendipcintegration.h
+++ b/src/plugins/clangcodemodel/clangbackendipcintegration.h
@@ -115,24 +115,30 @@ private:
     QHash<quint64, QFutureInterface<CppTools::SymbolInfo>> m_followTable;
 };
 
-class IpcSenderInterface
+class IpcSender : public ClangBackEnd::ClangCodeModelServerInterface
 {
 public:
-    virtual ~IpcSenderInterface() {}
+    IpcSender(ClangBackEnd::ClangCodeModelConnectionClient *connectionClient);
 
-    virtual void end() = 0;
-    virtual void registerTranslationUnitsForEditor(const ClangBackEnd::RegisterTranslationUnitForEditorMessage &message) = 0;
-    virtual void updateTranslationUnitsForEditor(const ClangBackEnd::UpdateTranslationUnitsForEditorMessage &message) = 0;
-    virtual void unregisterTranslationUnitsForEditor(const ClangBackEnd::UnregisterTranslationUnitsForEditorMessage &message) = 0;
-    virtual void registerProjectPartsForEditor(const ClangBackEnd::RegisterProjectPartsForEditorMessage &message) = 0;
-    virtual void unregisterProjectPartsForEditor(const ClangBackEnd::UnregisterProjectPartsForEditorMessage &message) = 0;
-    virtual void registerUnsavedFilesForEditor(const ClangBackEnd::RegisterUnsavedFilesForEditorMessage &message) = 0;
-    virtual void unregisterUnsavedFilesForEditor(const ClangBackEnd::UnregisterUnsavedFilesForEditorMessage &message) = 0;
-    virtual void completeCode(const ClangBackEnd::CompleteCodeMessage &message) = 0;
-    virtual void requestDocumentAnnotations(const ClangBackEnd::RequestDocumentAnnotationsMessage &message) = 0;
-    virtual void requestReferences(const ClangBackEnd::RequestReferencesMessage &message) = 0;
-    virtual void requestFollowSymbol(const ClangBackEnd::RequestFollowSymbolMessage &message) = 0;
-    virtual void updateVisibleTranslationUnits(const ClangBackEnd::UpdateVisibleTranslationUnitsMessage &message) = 0;
+    void end() override;
+    void registerTranslationUnitsForEditor(const ClangBackEnd::RegisterTranslationUnitForEditorMessage &message) override;
+    void updateTranslationUnitsForEditor(const ClangBackEnd::UpdateTranslationUnitsForEditorMessage &message) override;
+    void unregisterTranslationUnitsForEditor(const ClangBackEnd::UnregisterTranslationUnitsForEditorMessage &message) override;
+    void registerProjectPartsForEditor(const ClangBackEnd::RegisterProjectPartsForEditorMessage &message) override;
+    void unregisterProjectPartsForEditor(const ClangBackEnd::UnregisterProjectPartsForEditorMessage &message) override;
+    void registerUnsavedFilesForEditor(const ClangBackEnd::RegisterUnsavedFilesForEditorMessage &message) override;
+    void unregisterUnsavedFilesForEditor(const ClangBackEnd::UnregisterUnsavedFilesForEditorMessage &message) override;
+    void completeCode(const ClangBackEnd::CompleteCodeMessage &message) override;
+    void requestDocumentAnnotations(const ClangBackEnd::RequestDocumentAnnotationsMessage &message) override;
+    void requestReferences(const ClangBackEnd::RequestReferencesMessage &message) override;
+    void requestFollowSymbol(const ClangBackEnd::RequestFollowSymbolMessage &message) override;
+    void updateVisibleTranslationUnits(const ClangBackEnd::UpdateVisibleTranslationUnitsMessage &message) override;
+
+private:
+    bool isConnected() const;
+
+private:
+    ClangBackEnd::ClangCodeModelConnectionClient *m_connection = nullptr;
 };
 
 class IpcCommunicator : public QObject
@@ -193,7 +199,7 @@ public:
     bool isNotWaitingForCompletion() const;
 
 public: // for tests
-    IpcSenderInterface *setIpcSender(IpcSenderInterface *ipcSender);
+    IpcSender *setIpcSender(IpcSender *ipcSender);
     void killBackendProcess();
 
 signals: // for tests
@@ -226,7 +232,7 @@ private:
     IpcReceiver m_ipcReceiver;
     ClangBackEnd::ClangCodeModelConnectionClient m_connection;
     QTimer m_backendStartTimeOut;
-    QScopedPointer<IpcSenderInterface> m_ipcSender;
+    QScopedPointer<IpcSender> m_ipcSender;
     int m_connectedCount = 0;
 };
 

From 0269bf537bce9ea18f14ab7075a99ace202d0d2d Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 27 Feb 2017 15:47:47 +0100
Subject: [PATCH 24/41] Macros: Modernize

* Replace 0 with nullptr
* Remove redundant pimpl
* Use inline member initialization

Started-by: Laurent Montel <laurent.montel@kdab.com>
Change-Id: I15ace2581c13ecf24b7c947972b9435fbcaa12ab
Reviewed-by: Laurent Montel <laurent.montel@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/macros/imacrohandler.cpp          | 36 ++++---------------
 src/plugins/macros/imacrohandler.h            |  6 +---
 src/plugins/macros/macromanager.cpp           | 12 +++----
 src/plugins/macros/macrosplugin.cpp           |  4 ---
 src/plugins/macros/macrosplugin.h             |  3 +-
 src/plugins/macros/texteditormacrohandler.cpp |  5 ++-
 src/plugins/macros/texteditormacrohandler.h   |  2 +-
 7 files changed, 16 insertions(+), 52 deletions(-)

diff --git a/src/plugins/macros/imacrohandler.cpp b/src/plugins/macros/imacrohandler.cpp
index 15d36b63586..b9b3fbf2f46 100644
--- a/src/plugins/macros/imacrohandler.cpp
+++ b/src/plugins/macros/imacrohandler.cpp
@@ -67,55 +67,31 @@ using namespace Macros::Internal;
     the macro event.
 */
 
-class IMacroHandler::IMacroHandlerPrivate
-{
-public:
-    IMacroHandlerPrivate();
-
-    Macro *currentMacro;
-};
-
-IMacroHandler::IMacroHandlerPrivate::IMacroHandlerPrivate() :
-    currentMacro(0)
-{
-}
-
-
 // ---------- IMacroHandler ------------
 
-IMacroHandler::IMacroHandler():
-    d(new IMacroHandlerPrivate)
-{
-}
-
-IMacroHandler::~IMacroHandler()
-{
-    delete d;
-}
-
 void IMacroHandler::startRecording(Macro* macro)
 {
-    d->currentMacro = macro;
+    m_currentMacro = macro;
 }
 
 void IMacroHandler::endRecordingMacro(Macro* macro)
 {
     Q_UNUSED(macro)
-    d->currentMacro = 0;
+    m_currentMacro = nullptr;
 }
 
 void IMacroHandler::addMacroEvent(const MacroEvent& event)
 {
-    if (d->currentMacro)
-        d->currentMacro->append(event);
+    if (m_currentMacro)
+        m_currentMacro->append(event);
 }
 
 void IMacroHandler::setCurrentMacro(Macro *macro)
 {
-    d->currentMacro = macro;
+    m_currentMacro = macro;
 }
 
 bool IMacroHandler::isRecording() const
 {
-    return d->currentMacro != 0;
+    return m_currentMacro != nullptr;
 }
diff --git a/src/plugins/macros/imacrohandler.h b/src/plugins/macros/imacrohandler.h
index e05e4c063c7..b7c38a57ac9 100644
--- a/src/plugins/macros/imacrohandler.h
+++ b/src/plugins/macros/imacrohandler.h
@@ -39,9 +39,6 @@ class IMacroHandler: public QObject
     Q_OBJECT
 
 public:
-    IMacroHandler();
-    ~IMacroHandler();
-
     virtual void startRecording(Macro* macro);
     virtual void endRecordingMacro(Macro* macro);
 
@@ -58,8 +55,7 @@ protected:
 private:
     friend class MacroManager;
 
-    class IMacroHandlerPrivate;
-    IMacroHandlerPrivate *d;
+    Macro *m_currentMacro = nullptr;
 };
 
 } // namespace Internal
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp
index 81fe1c4d412..8b6e5b0117d 100644
--- a/src/plugins/macros/macromanager.cpp
+++ b/src/plugins/macros/macromanager.cpp
@@ -96,8 +96,8 @@ public:
     MacroManager *q;
     QMap<QString, Macro *> macros;
     QMap<QString, QAction *> actions;
-    Macro *currentMacro;
-    bool isRecording;
+    Macro *currentMacro = nullptr;
+    bool isRecording = false;
 
     QList<IMacroHandler*> handlers;
 
@@ -115,9 +115,7 @@ public:
 };
 
 MacroManager::MacroManagerPrivate::MacroManagerPrivate(MacroManager *qq):
-    q(qq),
-    currentMacro(0),
-    isRecording(false)
+    q(qq)
 {
     // Load existing macros
     initialize();
@@ -179,7 +177,7 @@ void MacroManager::MacroManagerPrivate::removeMacro(const QString &name)
     // Remove macro from the map
     Macro *macro = macros.take(name);
     if (macro == currentMacro)
-        currentMacro = 0;
+        currentMacro = nullptr;
     delete macro;
 }
 
@@ -243,7 +241,7 @@ void MacroManager::MacroManagerPrivate::showSaveDialog()
 
 
 // ---------- MacroManager ------------
-MacroManager *MacroManager::m_instance = 0;
+MacroManager *MacroManager::m_instance = nullptr;
 
 MacroManager::MacroManager(QObject *parent) :
     QObject(parent),
diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp
index 7230bf29c96..38be1c5f8dc 100644
--- a/src/plugins/macros/macrosplugin.cpp
+++ b/src/plugins/macros/macrosplugin.cpp
@@ -48,10 +48,6 @@
 
 using namespace Macros::Internal;
 
-MacrosPlugin::MacrosPlugin() : m_macroManager(0)
-{
-}
-
 MacrosPlugin::~MacrosPlugin()
 {
     delete m_macroManager;
diff --git a/src/plugins/macros/macrosplugin.h b/src/plugins/macros/macrosplugin.h
index dcb14694b81..2b1263c824f 100644
--- a/src/plugins/macros/macrosplugin.h
+++ b/src/plugins/macros/macrosplugin.h
@@ -38,14 +38,13 @@ class MacrosPlugin : public ExtensionSystem::IPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Macros.json")
 
 public:
-    MacrosPlugin();
     ~MacrosPlugin();
 
     bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
 
 private:
-    MacroManager *m_macroManager;
+    MacroManager *m_macroManager = nullptr;
 };
 
 } // namespace Internal
diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp
index 6626f103f4d..0dc766d9ed6 100644
--- a/src/plugins/macros/texteditormacrohandler.cpp
+++ b/src/plugins/macros/texteditormacrohandler.cpp
@@ -53,8 +53,7 @@ static quint8 AUTOREP = 4;
 static quint8 COUNT = 5;
 
 
-TextEditorMacroHandler::TextEditorMacroHandler():
-    IMacroHandler()
+TextEditorMacroHandler::TextEditorMacroHandler()
 {
     Core::EditorManager *editorManager = Core::EditorManager::instance();
     connect(editorManager, &Core::EditorManager::currentEditorChanged,
@@ -140,5 +139,5 @@ void TextEditorMacroHandler::closeEditor(Core::IEditor *editor)
     Q_UNUSED(editor);
     if (isRecording() && m_currentEditor && m_currentEditor->widget())
         m_currentEditor->widget()->removeEventFilter(this);
-    m_currentEditor = 0;
+    m_currentEditor = nullptr;
 }
diff --git a/src/plugins/macros/texteditormacrohandler.h b/src/plugins/macros/texteditormacrohandler.h
index 1c4cda35aca..251986a3e21 100644
--- a/src/plugins/macros/texteditormacrohandler.h
+++ b/src/plugins/macros/texteditormacrohandler.h
@@ -53,7 +53,7 @@ public:
     void closeEditor(Core::IEditor *editor);
 
 private:
-    TextEditor::BaseTextEditor *m_currentEditor;
+    TextEditor::BaseTextEditor *m_currentEditor = nullptr;
 };
 
 } // namespace Internal

From 8b80442131f970bac6cb7192274ae122ccd76ab9 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Tue, 26 Sep 2017 16:49:08 +0200
Subject: [PATCH 25/41] QmlDesigner: Add support Qt Quick 2.10

Change-Id: Ic6ba5224c8b70bab60e903a8e159749a69f7818e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../qmldesigner/designercore/model/texttomodelmerger.cpp        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 0af1d0a2344..47ce2bad158 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -71,7 +71,7 @@ static inline bool isSupportedAttachedProperties(const QString &propertyName)
 static inline QStringList supportedVersionsList()
 {
     static const QStringList list = {
-        "2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9"
+        "2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9", "2.10"
     };
     return list;
 }

From 4c04cff7c1f7fd4aa1fa50c14e20d1ca0a46ab71 Mon Sep 17 00:00:00 2001
From: Claus Steuer <claus755@gmail.com>
Date: Sat, 9 Sep 2017 16:46:43 +0200
Subject: [PATCH 26/41] AutoTest: Test execution from result output pane

Enable test execution via context menu in the result output pane.
At the moment only gtest is supported.

Task-number: QTCREATORBUG-16695
Change-Id: Ib39164c3cb44d249647b11e25dc51c9ac5db89c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../autotest/gtest/gtestoutputreader.cpp      | 69 ++-----------------
 .../autotest/gtest/gtestoutputreader.h        |  8 ---
 src/plugins/autotest/gtest/gtestresult.cpp    | 66 ++++++++++++++++--
 src/plugins/autotest/gtest/gtestresult.h      | 12 +++-
 src/plugins/autotest/testnavigationwidget.cpp | 20 +-----
 src/plugins/autotest/testresult.cpp           |  5 ++
 src/plugins/autotest/testresult.h             |  3 +
 src/plugins/autotest/testresultspane.cpp      | 43 ++++++++++--
 src/plugins/autotest/testresultspane.h        |  5 +-
 src/plugins/autotest/testrunner.cpp           | 23 +++++++
 src/plugins/autotest/testrunner.h             |  1 +
 11 files changed, 153 insertions(+), 102 deletions(-)

diff --git a/src/plugins/autotest/gtest/gtestoutputreader.cpp b/src/plugins/autotest/gtest/gtestoutputreader.cpp
index 764cf543a1b..912a563fa83 100644
--- a/src/plugins/autotest/gtest/gtestoutputreader.cpp
+++ b/src/plugins/autotest/gtest/gtestoutputreader.cpp
@@ -74,13 +74,13 @@ void GTestOutputReader::processOutput(const QByteArray &outputLine)
             m_description = line;
             if (m_iteration > 1)
                 m_description.append(' ' + tr("(iteration %1)").arg(m_iteration));
-            TestResultPtr testResult = TestResultPtr(new GTestResult);
+            TestResultPtr testResult = TestResultPtr(new GTestResult(m_projectFile));
             testResult->setResult(Result::MessageInternal);
             testResult->setDescription(m_description);
             m_futureInterface.reportResult(testResult);
             m_description.clear();
         } else if (disabledTests.exactMatch(line)) {
-            TestResultPtr testResult = TestResultPtr(new GTestResult);
+            TestResultPtr testResult = TestResultPtr(new GTestResult(m_projectFile));
             testResult->setResult(Result::MessageDisabledTests);
             int disabled = disabledTests.cap(1).toInt();
             testResult->setDescription(tr("You have %n disabled test(s).", 0, disabled));
@@ -98,7 +98,6 @@ void GTestOutputReader::processOutput(const QByteArray &outputLine)
         m_futureInterface.reportResult(TestResultPtr(testResult));
         m_currentTestName.clear();
         m_currentTestSet.clear();
-        m_normalizedCurrentTestSet.clear();
     } else if (newTestStarts.exactMatch(line)) {
         setCurrentTestName(newTestStarts.cap(1));
         TestResultPtr testResult = TestResultPtr(createDefaultResult());
@@ -112,7 +111,7 @@ void GTestOutputReader::processOutput(const QByteArray &outputLine)
         m_futureInterface.reportResult(testResult);
     } else if (newTestSetStarts.exactMatch(line)) {
         setCurrentTestSet(newTestSetStarts.cap(1));
-        TestResultPtr testResult = TestResultPtr(new GTestResult);
+        TestResultPtr testResult = TestResultPtr(new GTestResult(m_projectFile));
         testResult->setResult(Result::MessageCurrentTest);
         testResult->setDescription(tr("Entering test set %1").arg(m_currentTestSet));
         m_futureInterface.reportResult(testResult);
@@ -163,39 +162,21 @@ void GTestOutputReader::processOutput(const QByteArray &outputLine)
 void GTestOutputReader::setCurrentTestSet(const QString &testSet)
 {
     m_currentTestSet = testSet;
-    m_normalizedCurrentTestSet = normalizeName(testSet);
 }
 
 void GTestOutputReader::setCurrentTestName(const QString &testName)
 {
     m_currentTestName = testName;
-    m_normalizedTestName = normalizeTestName(testName);
-}
-
-QString GTestOutputReader::normalizeName(const QString &name) const
-{
-    static QRegExp parameterIndex("/\\d+");
-
-    QString nameWithoutParameterIndices = name;
-    nameWithoutParameterIndices.remove(parameterIndex);
-
-    return nameWithoutParameterIndices.split('/').last();
-}
-
-QString GTestOutputReader::normalizeTestName(const QString &testname) const
-{
-    QString nameWithoutTypeParam = testname.split(',').first();
-
-    return normalizeName(nameWithoutTypeParam);
 }
 
 GTestResult *GTestOutputReader::createDefaultResult() const
 {
-    GTestResult *result = new GTestResult(m_executable, m_currentTestName);
+    GTestResult *result = new GTestResult(m_executable, m_projectFile, m_currentTestName);
     result->setTestSetName(m_currentTestSet);
     result->setIteration(m_iteration);
 
-    const TestTreeItem *testItem = findTestTreeItemForCurrentLine();
+    const TestTreeItem *testItem = result->findTestTreeItem();
+
     if (testItem && testItem->line()) {
         result->setFileName(testItem->filePath());
         result->setLine(static_cast<int>(testItem->line()));
@@ -204,43 +185,5 @@ GTestResult *GTestOutputReader::createDefaultResult() const
     return result;
 }
 
-const TestTreeItem *GTestOutputReader::findTestTreeItemForCurrentLine() const
-{
-    const auto item = TestTreeModel::instance()->findNonRootItem([&](const Utils::TreeItem *item) {
-        const TestTreeItem &treeItem = static_cast<const TestTreeItem &>(*item);
-        return matches(treeItem);
-    });
-
-    return static_cast<const TestTreeItem *>(item);
-}
-
-bool GTestOutputReader::matches(const TestTreeItem &treeItem) const
-{
-    if (treeItem.proFile() != m_projectFile)
-        return false;
-
-    if (m_currentTestSet.isEmpty())
-        return matchesTestCase(treeItem);
-
-    return matchesTestFunctionOrSet(treeItem);
-}
-
-bool GTestOutputReader::matchesTestFunctionOrSet(const TestTreeItem &treeItem) const
-{
-    if (treeItem.type() != TestTreeItem::TestFunctionOrSet)
-        return false;
-
-    const QString testItemTestSet = treeItem.parentItem()->name() + '.' + treeItem.name();
-    return testItemTestSet == m_normalizedCurrentTestSet;
-}
-
-bool GTestOutputReader::matchesTestCase(const TestTreeItem &treeItem) const
-{
-    if (treeItem.type() != TestTreeItem::TestCase)
-        return false;
-
-    return treeItem.name() == m_normalizedTestName;
-}
-
 } // namespace Internal
 } // namespace Autotest
diff --git a/src/plugins/autotest/gtest/gtestoutputreader.h b/src/plugins/autotest/gtest/gtestoutputreader.h
index e46e29fcd3f..ebe59cd64d4 100644
--- a/src/plugins/autotest/gtest/gtestoutputreader.h
+++ b/src/plugins/autotest/gtest/gtestoutputreader.h
@@ -50,20 +50,12 @@ protected:
 private:
     void setCurrentTestSet(const QString &testSet);
     void setCurrentTestName(const QString &testName);
-    QString normalizeName(const QString &name) const;
-    QString normalizeTestName(const QString &testname) const;
     GTestResult *createDefaultResult() const;
-    const TestTreeItem *findTestTreeItemForCurrentLine() const;
-    bool matches(const TestTreeItem &treeItem) const;
-    bool matchesTestFunctionOrSet(const TestTreeItem &treeItem) const;
-    bool matchesTestCase(const TestTreeItem &treeItem) const;
 
     QString m_executable;
     QString m_projectFile;
     QString m_currentTestName;
-    QString m_normalizedTestName;
     QString m_currentTestSet;
-    QString m_normalizedCurrentTestSet;
     QString m_description;
     int m_iteration = 1;
 };
diff --git a/src/plugins/autotest/gtest/gtestresult.cpp b/src/plugins/autotest/gtest/gtestresult.cpp
index cbccaea837e..5945ebf5aa9 100644
--- a/src/plugins/autotest/gtest/gtestresult.cpp
+++ b/src/plugins/autotest/gtest/gtestresult.cpp
@@ -24,17 +24,20 @@
 ****************************************************************************/
 
 #include "gtestresult.h"
+#include "../testtreemodel.h"
+#include "../testtreeitem.h"
 
 namespace Autotest {
 namespace Internal {
 
-GTestResult::GTestResult(const QString &name)
-    : TestResult(name)
+GTestResult::GTestResult(const QString &projectFile, const QString &name)
+    : TestResult(name), m_projectFile(projectFile)
 {
 }
 
-GTestResult::GTestResult(const QString &executable, const QString &name)
-    : TestResult(executable, name)
+GTestResult::GTestResult(const QString &executable, const QString &projectFile,
+                         const QString &name)
+    : TestResult(executable, name), m_projectFile(projectFile)
 {
 }
 
@@ -68,5 +71,60 @@ bool GTestResult::isDirectParentOf(const TestResult *other, bool *needsIntermedi
     return isTest() && gtOther->isTestSet();
 }
 
+static QString normalizeName(const QString &name)
+{
+    static QRegExp parameterIndex("/\\d+");
+
+    QString nameWithoutParameterIndices = name;
+    nameWithoutParameterIndices.remove(parameterIndex);
+
+    return nameWithoutParameterIndices.split('/').last();
+}
+
+static QString normalizeTestName(const QString &testname)
+{
+    QString nameWithoutTypeParam = testname.split(',').first();
+
+    return normalizeName(nameWithoutTypeParam);
+}
+
+const TestTreeItem *GTestResult::findTestTreeItem() const
+{
+    const auto item = TestTreeModel::instance()->findNonRootItem([this](const Utils::TreeItem *item) {
+        const TestTreeItem &treeItem = static_cast<const TestTreeItem &>(*item);
+        return matches(treeItem);
+    });
+
+    return static_cast<const TestTreeItem *>(item);
+}
+
+bool GTestResult::matches(const TestTreeItem &treeItem) const
+{
+    if (treeItem.proFile() != m_projectFile)
+        return false;
+
+    if (isTest())
+        return matchesTestCase(treeItem);
+
+    return matchesTestFunctionOrSet(treeItem);
+}
+
+bool GTestResult::matchesTestFunctionOrSet(const TestTreeItem &treeItem) const
+{
+    if (treeItem.type() != TestTreeItem::TestFunctionOrSet)
+        return false;
+
+    const QString testItemTestSet = treeItem.parentItem()->name() + '.' + treeItem.name();
+    return testItemTestSet == normalizeName(m_testSetName);
+}
+
+bool GTestResult::matchesTestCase(const TestTreeItem &treeItem) const
+{
+    if (treeItem.type() != TestTreeItem::TestCase)
+        return false;
+
+    return treeItem.name() == normalizeTestName(name());
+}
+
 } // namespace Internal
 } // namespace Autotest
diff --git a/src/plugins/autotest/gtest/gtestresult.h b/src/plugins/autotest/gtest/gtestresult.h
index 491fe41662f..88e5476085c 100644
--- a/src/plugins/autotest/gtest/gtestresult.h
+++ b/src/plugins/autotest/gtest/gtestresult.h
@@ -33,17 +33,25 @@ namespace Internal {
 class GTestResult : public TestResult
 {
 public:
-    explicit GTestResult(const QString &name = QString());
-    GTestResult(const QString &executable, const QString &name);
+    GTestResult(const QString &projectFile, const QString &name = QString());
+    GTestResult(const QString &executable, const QString &projectFile, const QString &name);
     const QString outputString(bool selected) const override;
 
     void setTestSetName(const QString &testSetName) { m_testSetName = testSetName; }
     void setIteration(int iteration) { m_iteration = iteration; }
     bool isDirectParentOf(const TestResult *other, bool *needsIntermediate) const override;
+    virtual const TestTreeItem *findTestTreeItem() const override;
+
 private:
     bool isTest() const { return m_testSetName.isEmpty(); }
     bool isTestSet() const { return !m_testSetName.isEmpty(); }
+
+    bool matches(const TestTreeItem &item) const;
+    bool matchesTestFunctionOrSet(const TestTreeItem &treeItem) const;
+    bool matchesTestCase(const TestTreeItem &treeItem) const;
+
     QString m_testSetName;
+    QString m_projectFile;
     int m_iteration = 1;
 };
 
diff --git a/src/plugins/autotest/testnavigationwidget.cpp b/src/plugins/autotest/testnavigationwidget.cpp
index ddc010ef0d2..aaeef64a1a6 100644
--- a/src/plugins/autotest/testnavigationwidget.cpp
+++ b/src/plugins/autotest/testnavigationwidget.cpp
@@ -301,25 +301,7 @@ void TestNavigationWidget::onRunThisTestTriggered(TestRunMode runMode)
         return;
 
     TestTreeItem *item = static_cast<TestTreeItem *>(sourceIndex.internalPointer());
-    TestConfiguration *configuration;
-    switch (runMode) {
-    case TestRunMode::Run:
-    case TestRunMode::RunWithoutDeploy:
-        configuration = item->testConfiguration();
-        break;
-    case TestRunMode::Debug:
-    case TestRunMode::DebugWithoutDeploy:
-        configuration = item->debugConfiguration();
-        break;
-    default:
-        configuration = nullptr;
-    }
-
-    if (configuration) {
-        TestRunner *runner = TestRunner::instance();
-        runner->setSelectedTests({configuration});
-        runner->prepareToRunTests(runMode);
-    }
+    TestRunner::instance()->runTest(runMode, item);
 }
 
 TestNavigationWidgetFactory::TestNavigationWidgetFactory()
diff --git a/src/plugins/autotest/testresult.cpp b/src/plugins/autotest/testresult.cpp
index 2dcd9dda70a..96db2b10c63 100644
--- a/src/plugins/autotest/testresult.cpp
+++ b/src/plugins/autotest/testresult.cpp
@@ -58,6 +58,11 @@ const QString TestResult::outputString(bool selected) const
     return selected ? m_description : m_description.split('\n').first();
 }
 
+const TestTreeItem *TestResult::findTestTreeItem() const
+{
+    return nullptr;
+}
+
 Result::Type TestResult::resultFromString(const QString &resultString)
 {
     if (resultString == "pass")
diff --git a/src/plugins/autotest/testresult.h b/src/plugins/autotest/testresult.h
index a7414f85d36..d094c345ed3 100644
--- a/src/plugins/autotest/testresult.h
+++ b/src/plugins/autotest/testresult.h
@@ -35,6 +35,8 @@
 namespace Autotest {
 namespace Internal {
 
+class TestTreeItem;
+
 namespace Result{
 enum Type {
     Pass, FIRST_TYPE = Pass,
@@ -76,6 +78,7 @@ public:
     virtual ~TestResult() {}
 
     virtual const QString outputString(bool selected) const;
+    virtual const TestTreeItem *findTestTreeItem() const;
 
     QString executable() const { return m_executable; }
     QString name() const { return m_name; }
diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp
index 332a518d94f..c3317fdfe96 100644
--- a/src/plugins/autotest/testresultspane.cpp
+++ b/src/plugins/autotest/testresultspane.cpp
@@ -144,7 +144,7 @@ TestResultsPane::TestResultsPane(QObject *parent) :
     connect(m_treeView, &Utils::TreeView::customContextMenuRequested,
             this, &TestResultsPane::onCustomContextMenuRequested);
     connect(m_treeView, &ResultsTreeView::copyShortcutTriggered, [this] () {
-       onCopyItemTriggered(m_treeView->currentIndex());
+        onCopyItemTriggered(getTestResult(m_treeView->currentIndex()));
     });
     connect(m_model, &TestResultModel::requestExpansion, [this] (QModelIndex idx) {
         m_treeView->expand(m_filterModel->mapFromSource(idx));
@@ -562,11 +562,12 @@ void TestResultsPane::onCustomContextMenuRequested(const QPoint &pos)
 {
     const bool resultsAvailable = m_filterModel->hasResults();
     const bool enabled = !m_testRunning && resultsAvailable;
-    const QModelIndex clicked = m_treeView->indexAt(pos);
+    const TestResult *clicked = getTestResult(m_treeView->indexAt(pos));
     QMenu menu;
+
     QAction *action = new QAction(tr("Copy"), &menu);
     action->setShortcut(QKeySequence(QKeySequence::Copy));
-    action->setEnabled(resultsAvailable);
+    action->setEnabled(resultsAvailable && clicked);
     connect(action, &QAction::triggered, [this, clicked] () {
        onCopyItemTriggered(clicked);
     });
@@ -582,14 +583,36 @@ void TestResultsPane::onCustomContextMenuRequested(const QPoint &pos)
     connect(action, &QAction::triggered, this, &TestResultsPane::onSaveWholeTriggered);
     menu.addAction(action);
 
+    action = new QAction(tr("Run This Test"), &menu);
+    action->setEnabled(clicked && clicked->findTestTreeItem());
+    connect(action, &QAction::triggered, this, [this, clicked] {
+        onRunThisTestTriggered(TestRunMode::Run, clicked);
+    });
+    menu.addAction(action);
+
+    action = new QAction(tr("Debug This Test"), &menu);
+    action->setEnabled(clicked && clicked->findTestTreeItem());
+    connect(action, &QAction::triggered, this, [this, clicked] {
+        onRunThisTestTriggered(TestRunMode::Debug, clicked);
+    });
+    menu.addAction(action);
+
     menu.exec(m_treeView->mapToGlobal(pos));
 }
 
-void TestResultsPane::onCopyItemTriggered(const QModelIndex &idx)
+const TestResult *TestResultsPane::getTestResult(const QModelIndex &idx)
 {
     if (!idx.isValid())
-        return;
+        return nullptr;
+
     const TestResult *result = m_filterModel->testResult(idx);
+    QTC_CHECK(result);
+
+    return result;
+}
+
+void TestResultsPane::onCopyItemTriggered(const TestResult *result)
+{
     QTC_ASSERT(result, return);
     QApplication::clipboard()->setText(result->outputString(true));
 }
@@ -614,6 +637,16 @@ void TestResultsPane::onSaveWholeTriggered()
     }
 }
 
+void TestResultsPane::onRunThisTestTriggered(TestRunMode runMode, const TestResult *result)
+{
+    QTC_ASSERT(result, return);
+
+    const TestTreeItem *item = result->findTestTreeItem();
+
+    if (item)
+        TestRunner::instance()->runTest(runMode, item);
+}
+
 void TestResultsPane::toggleOutputStyle()
 {
     const bool displayText = m_outputWidget->currentIndex() == 0;
diff --git a/src/plugins/autotest/testresultspane.h b/src/plugins/autotest/testresultspane.h
index 6b837055672..911396b1939 100644
--- a/src/plugins/autotest/testresultspane.h
+++ b/src/plugins/autotest/testresultspane.h
@@ -52,6 +52,7 @@ namespace Internal {
 
 class TestResultModel;
 class TestResultFilterModel;
+class TestResult;
 
 class ResultsTreeView : public Utils::TreeView
 {
@@ -109,9 +110,11 @@ private:
     void onScrollBarRangeChanged(int, int max);
     void updateRunActions();
     void onCustomContextMenuRequested(const QPoint &pos);
-    void onCopyItemTriggered(const QModelIndex &idx);
+    const TestResult *getTestResult(const QModelIndex &idx);
+    void onCopyItemTriggered(const TestResult *result);
     void onCopyWholeTriggered();
     void onSaveWholeTriggered();
+    void onRunThisTestTriggered(TestRunMode runMode, const TestResult *result);
     void toggleOutputStyle();
     QString getWholeOutput(const QModelIndex &parent = QModelIndex());
 
diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp
index b263f44e557..81bc2c7451d 100644
--- a/src/plugins/autotest/testrunner.cpp
+++ b/src/plugins/autotest/testrunner.cpp
@@ -31,6 +31,7 @@
 #include "testrunconfiguration.h"
 #include "testsettings.h"
 #include "testoutputreader.h"
+#include "testtreeitem.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/futureprogress.h>
@@ -106,6 +107,28 @@ void TestRunner::setSelectedTests(const QList<TestConfiguration *> &selected)
      m_selectedTests = selected;
 }
 
+void TestRunner::runTest(TestRunMode mode, const TestTreeItem *item)
+{
+    TestConfiguration *configuration;
+    switch (mode) {
+    case TestRunMode::Run:
+    case TestRunMode::RunWithoutDeploy:
+        configuration = item->testConfiguration();
+        break;
+    case TestRunMode::Debug:
+    case TestRunMode::DebugWithoutDeploy:
+        configuration = item->debugConfiguration();
+        break;
+    default:
+        configuration = nullptr;
+    }
+
+    if (configuration) {
+        setSelectedTests({configuration});
+        prepareToRunTests(mode);
+    }
+}
+
 static QString processInformation(const QProcess &proc)
 {
     QString information("\nCommand line: " + proc.program() + ' ' + proc.arguments().join(' '));
diff --git a/src/plugins/autotest/testrunner.h b/src/plugins/autotest/testrunner.h
index 004c4f48313..0638401ca08 100644
--- a/src/plugins/autotest/testrunner.h
+++ b/src/plugins/autotest/testrunner.h
@@ -55,6 +55,7 @@ public:
     ~TestRunner();
 
     void setSelectedTests(const QList<TestConfiguration *> &selected);
+    void runTest(TestRunMode mode, const TestTreeItem *item);
     bool isTestRunning() const { return m_executingTests; }
 
     void prepareToRunTests(TestRunMode mode);

From 6f481bd9da32b79fc0aa361c30406b2f4a6af918 Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Mon, 25 Sep 2017 15:36:23 +0200
Subject: [PATCH 27/41] CPaster: Clean forward declaration

Change-Id: I05126edb499cff64bd83839933ad831d9845e0e3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/cpaster/cpasterplugin.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h
index e86b17983da..671fdbb71f6 100644
--- a/src/plugins/cpaster/cpasterplugin.h
+++ b/src/plugins/cpaster/cpasterplugin.h
@@ -37,8 +37,6 @@ class QAction;
 QT_END_NAMESPACE
 
 namespace CodePaster {
-class CustomFetcher;
-class CustomPoster;
 class Settings;
 class Protocol;
 

From 895acd23e33408dd967519f1e3a277b0ac28387b Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 27 Sep 2017 08:22:02 +0200
Subject: [PATCH 28/41] Debugger: Move external terminal into separate
 RunWorker

Change-Id: Ifb9701f840195ba90db48a0f6fa07b28e0409648
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/cdb/cdbengine.cpp      |   9 +-
 src/plugins/debugger/debuggerdialogs.cpp    |   1 -
 src/plugins/debugger/debuggerengine.cpp     |  32 ++---
 src/plugins/debugger/debuggerengine.h       |   4 +-
 src/plugins/debugger/debuggerplugin.cpp     |   7 +-
 src/plugins/debugger/debuggerruncontrol.cpp |  68 +++++-----
 src/plugins/debugger/debuggerruncontrol.h   |   8 ++
 src/plugins/debugger/gdb/gdbengine.cpp      | 131 ++++++--------------
 src/plugins/debugger/gdb/gdbengine.h        |  12 +-
 src/plugins/debugger/lldb/lldbengine.cpp    |  74 +----------
 src/plugins/debugger/lldb/lldbengine.h      |   6 -
 src/plugins/debugger/terminal.cpp           |  70 +++++++++++
 src/plugins/debugger/terminal.h             |  31 +++++
 13 files changed, 223 insertions(+), 230 deletions(-)

diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 6d64a7e4409..a860e5defaf 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -180,7 +180,7 @@ namespace Internal {
 
 static inline bool isCreatorConsole(const DebuggerRunParameters &sp)
 {
-    return !boolSetting(UseCdbConsole) && sp.useTerminal
+    return !boolSetting(UseCdbConsole) && sp.inferior.runMode == ApplicationLauncher::Console
            && (sp.startMode == StartInternal || sp.startMode == StartExternal);
 }
 
@@ -428,7 +428,7 @@ void CdbEngine::consoleStubProcessStarted()
     attachParameters.inferior.commandLineArguments.clear();
     attachParameters.attachPID = ProcessHandle(m_consoleStub->applicationPID());
     attachParameters.startMode = AttachExternal;
-    attachParameters.useTerminal = false;
+    attachParameters.inferior.runMode = ApplicationLauncher::Gui; // Force no terminal.
     showMessage(QString("Attaching to %1...").arg(attachParameters.attachPID.pid()), LogMisc);
     QString errorMessage;
     if (!launchCDB(attachParameters, &errorMessage)) {
@@ -542,7 +542,7 @@ bool CdbEngine::launchCDB(const DebuggerRunParameters &sp, QString *errorMessage
     // register idle (debuggee stop) notification
               << "-c"
               << ".idle_cmd " + m_extensionCommandPrefix + "idle";
-    if (sp.useTerminal) // Separate console
+    if (sp.inferior.runMode == ApplicationLauncher::Console) // Separate console
         arguments << "-2";
     if (boolSetting(IgnoreFirstChanceAccessViolation))
         arguments << "-x";
@@ -610,7 +610,8 @@ bool CdbEngine::launchCDB(const DebuggerRunParameters &sp, QString *errorMessage
 
     // Make sure that QTestLib uses OutputDebugString for logging.
     const QString qtLoggingToConsoleKey = QStringLiteral("QT_LOGGING_TO_CONSOLE");
-    if (!sp.useTerminal && !inferiorEnvironment.hasKey(qtLoggingToConsoleKey))
+    if (sp.inferior.runMode != ApplicationLauncher::Console
+            && !inferiorEnvironment.hasKey(qtLoggingToConsoleKey))
         inferiorEnvironment.set(qtLoggingToConsoleKey, QString(QLatin1Char('0')));
 
     m_process.setEnvironment(mergeEnvironment(inferiorEnvironment.toStringList(),
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 3a17544ab6c..64e1721f4de 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -425,7 +425,6 @@ void StartApplicationDialog::run(bool attachRemote)
     }
 
     StandardRunnable inferior = newParameters.runnable;
-    debugger->setUseTerminal(newParameters.runnable.runMode == ApplicationLauncher::Console);
     const QString inputAddress = dialog.d->channelOverrideEdit->text();
     if (!inputAddress.isEmpty())
         debugger->setRemoteChannel(inputAddress);
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index ecf31ab8410..ad58dc42daa 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -106,7 +106,6 @@ QDebug operator<<(QDebug str, const DebuggerRunParameters &sp)
             << " debugger environment=<" << sp.debugger.environment.size() << " variables>"
             << " workingDir=" << sp.inferior.workingDirectory
             << " attachPID=" << sp.attachPID.pid()
-            << " useTerminal=" << sp.useTerminal
             << " remoteChannel=" << sp.remoteChannel
             << " abi=" << sp.toolChainAbi.toString() << '\n';
     return str;
@@ -329,7 +328,7 @@ public:
     // The state we had before something unexpected happend.
     DebuggerState m_lastGoodState = DebuggerNotReady;
 
-    Terminal m_terminal;
+//    Terminal m_terminal;
     ProcessHandle m_inferiorPid;
 
     ModulesHandler m_modulesHandler;
@@ -545,18 +544,18 @@ void DebuggerEngine::start()
     d->m_lastGoodState = DebuggerNotReady;
     d->m_progress.setProgressValue(200);
 
-    d->m_terminal.setup();
-    if (d->m_terminal.isUsable()) {
-        connect(&d->m_terminal, &Terminal::stdOutReady, [this](const QString &msg) {
-            d->m_runTool->appendMessage(msg, Utils::StdOutFormatSameLine);
-        });
-        connect(&d->m_terminal, &Terminal::stdErrReady, [this](const QString &msg) {
-            d->m_runTool->appendMessage(msg, Utils::StdErrFormatSameLine);
-        });
-        connect(&d->m_terminal, &Terminal::error, [this](const QString &msg) {
-            d->m_runTool->appendMessage(msg, Utils::ErrorMessageFormat);
-        });
-    }
+//    d->m_terminal.setup();
+//    if (d->m_terminal.isUsable()) {
+//        connect(&d->m_terminal, &Terminal::stdOutReady, [this](const QString &msg) {
+//            d->m_runTool->appendMessage(msg, Utils::StdOutFormatSameLine);
+//        });
+//        connect(&d->m_terminal, &Terminal::stdErrReady, [this](const QString &msg) {
+//            d->m_runTool->appendMessage(msg, Utils::StdErrFormatSameLine);
+//        });
+//        connect(&d->m_terminal, &Terminal::error, [this](const QString &msg) {
+//            d->m_runTool->appendMessage(msg, Utils::ErrorMessageFormat);
+//        });
+//    }
 
     d->queueSetupEngine();
     QTC_ASSERT(state() == EngineSetupRequested, qDebug() << this << state());
@@ -1378,9 +1377,10 @@ DebuggerRunTool *DebuggerEngine::runTool() const
     return d->m_runTool.data();
 }
 
-Terminal *DebuggerEngine::terminal() const
+TerminalRunner *DebuggerEngine::terminal() const
 {
-    return &d->m_terminal;
+    QTC_ASSERT(d->m_runTool, return nullptr);
+    return d->m_runTool->terminalRunner();
 }
 
 void DebuggerEngine::selectWatchData(const QString &)
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 89723096d06..5178cb631c5 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -74,6 +74,7 @@ class QmlCppEngine;
 class DebuggerToolTipContext;
 class MemoryViewSetupData;
 class Terminal;
+class TerminalRunner;
 class ThreadId;
 
 class DebuggerRunParameters
@@ -87,7 +88,6 @@ public:
     Utils::Environment stubEnvironment;
     Utils::ProcessHandle attachPID;
     QStringList solibSearchPath;
-    bool useTerminal = false;
 
     // Used by Qml debugging.
     QUrl qmlServer;
@@ -461,7 +461,7 @@ protected:
     void setMasterEngine(DebuggerEngine *masterEngine);
 
     ProjectExplorer::RunControl *runControl() const;
-    Terminal *terminal() const;
+    TerminalRunner *terminal() const;
 
     static QString msgStopped(const QString &reason = QString());
     static QString msgStoppedBySignal(const QString &meaning, const QString &name);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 5637e4b18e6..5e378ac20c0 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2878,8 +2878,9 @@ static void createNewDock(QWidget *widget)
     dockWidget->show();
 }
 
-static QString formatStartParameters(const DebuggerRunParameters &sp)
+static QString formatStartParameters(const DebuggerRunTool *debugger)
 {
+    const DebuggerRunParameters &sp = debugger->runParameters();
     QString rc;
     QTextStream str(&rc);
     str << "Start parameters: '" << sp.displayName << "' mode: " << sp.startMode
@@ -2893,7 +2894,7 @@ static QString formatStartParameters(const DebuggerRunParameters &sp)
     if (!sp.inferior.executable.isEmpty()) {
         str << "Executable: " << QDir::toNativeSeparators(sp.inferior.executable)
             << ' ' << sp.inferior.commandLineArguments;
-        if (sp.useTerminal)
+        if (debugger->terminalRunner())
             str << " [terminal]";
         str << '\n';
         if (!sp.inferior.workingDirectory.isEmpty())
@@ -2928,7 +2929,7 @@ void DebuggerPluginPrivate::runControlStarted(DebuggerRunTool *runTool)
             .arg(runTool->engine()->objectName())
             .arg(runTool->runParameters().toolChainAbi.toString());
     showStatusMessage(message);
-    showMessage(formatStartParameters(runTool->runParameters()), LogDebug);
+    showMessage(formatStartParameters(runTool), LogDebug);
     showMessage(m_debuggerSettings->dump(), LogDebug);
     m_snapshotHandler->appendSnapshot(runTool);
     connectEngine(runTool);
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index e6832afe9aa..1ab8198fcd1 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "debuggerruncontrol.h"
+#include "terminal.h"
 
 #include "analyzer/analyzermanager.h"
 #include "console/console.h"
@@ -76,7 +77,7 @@ namespace Debugger {
 namespace Internal {
 
 DebuggerEngine *createCdbEngine(QStringList *error, DebuggerStartMode sm);
-DebuggerEngine *createGdbEngine(bool useTerminal, DebuggerStartMode sm);
+DebuggerEngine *createGdbEngine(DebuggerStartMode sm);
 DebuggerEngine *createPdbEngine();
 DebuggerEngine *createQmlEngine(bool useTerminal);
 DebuggerEngine *createQmlCppEngine(DebuggerEngine *cppEngine, bool useTerminal);
@@ -173,8 +174,13 @@ public:
     Utils::QtcProcess m_proc;
 };
 
-} // namespace Internal
+class DebuggerRunToolPrivate
+{
+public:
+    QPointer<TerminalRunner> terminalRunner;
+};
 
+} // namespace Internal
 
 static bool breakOnMainNextTime = false;
 
@@ -284,7 +290,13 @@ void DebuggerRunTool::setBreakOnMain(bool on)
 
 void DebuggerRunTool::setUseTerminal(bool on)
 {
-    m_runParameters.useTerminal = on;
+    if (on && !d->terminalRunner && m_runParameters.cppEngineType == GdbEngineType) {
+        d->terminalRunner = new TerminalRunner(this);
+        addStartDependency(d->terminalRunner);
+    }
+    if (!on && d->terminalRunner) {
+        QTC_CHECK(false); // User code can only switch from no terminal to one terminal.
+    }
 }
 
 void DebuggerRunTool::setCommandsAfterConnect(const QString &commands)
@@ -343,6 +355,7 @@ void DebuggerRunTool::setInferior(const Runnable &runnable)
 {
     QTC_ASSERT(runnable.is<StandardRunnable>(), reportFailure(); return);
     m_runParameters.inferior = runnable.as<StandardRunnable>();
+    setUseTerminal(m_runParameters.inferior.runMode == ApplicationLauncher::Console);
 }
 
 void DebuggerRunTool::setInferiorExecutable(const QString &executable)
@@ -469,7 +482,7 @@ void DebuggerRunTool::start()
 
     switch (m_runParameters.cppEngineType) {
         case GdbEngineType:
-            cppEngine = createGdbEngine(m_runParameters.useTerminal, m_runParameters.startMode);
+            cppEngine = createGdbEngine(m_runParameters.startMode);
             break;
         case CdbEngineType: {
             QStringList errors;
@@ -493,11 +506,11 @@ void DebuggerRunTool::start()
 
     switch (m_runParameters.masterEngineType) {
         case QmlEngineType:
-            m_engine = createQmlEngine(m_runParameters.useTerminal);
+            m_engine = createQmlEngine(terminalRunner() != nullptr);
             break;
         case QmlCppEngineType:
             if (cppEngine)
-                m_engine = createQmlCppEngine(cppEngine, m_runParameters.useTerminal);
+                m_engine = createQmlCppEngine(cppEngine, terminalRunner() != nullptr);
             break;
         default:
             m_engine = cppEngine;
@@ -710,14 +723,6 @@ bool DebuggerRunTool::fixupParameters()
         }
     }
 
-    // FIXME: We can't handle terminals yet.
-    if (rp.useTerminal && rp.cppEngineType == LldbEngineType) {
-        qWarning("Run in Terminal is not supported yet with the LLDB backend");
-        appendMessage(DebuggerPlugin::tr("Run in Terminal is not supported with the LLDB backend."),
-                      ErrorMessageFormat);
-        rp.useTerminal = false;
-    }
-
     if (rp.isNativeMixedDebugging())
         rp.inferior.environment.set("QV4_FORCE_INTERPRETER", "1");
 
@@ -727,8 +732,13 @@ bool DebuggerRunTool::fixupParameters()
     return true;
 }
 
+Internal::TerminalRunner *DebuggerRunTool::terminalRunner() const
+{
+    return d->terminalRunner;
+}
+
 DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit)
-    : RunWorker(runControl)
+    : RunWorker(runControl), d(new DebuggerRunToolPrivate)
 {
     setDisplayName("DebuggerRunTool");
 
@@ -745,13 +755,25 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit)
                 QString(), QString(), optionalPrompt);
     });
 
+    if (runConfig)
+        m_runParameters.displayName = runConfig->displayName();
+
+    if (runConfig && !kit)
+        kit = runConfig->target()->kit();
+    QTC_ASSERT(kit, return);
+
+    m_runParameters.cppEngineType = DebuggerKitInformation::engineType(kit);
+    m_runParameters.sysRoot = SysRootKitInformation::sysRoot(kit).toString();
+    m_runParameters.macroExpander = kit->macroExpander();
+    m_runParameters.debugger = DebuggerKitInformation::runnable(kit);
+
     Runnable r = runnable();
     if (r.is<StandardRunnable>()) {
         m_runParameters.inferior = r.as<StandardRunnable>();
-        m_runParameters.useTerminal = m_runParameters.inferior.runMode == ApplicationLauncher::Console;
         // Normalize to work around QTBUG-17529 (QtDeclarative fails with 'File name case mismatch'...)
         m_runParameters.inferior.workingDirectory =
                 FileUtils::normalizePathName(m_runParameters.inferior.workingDirectory);
+        setUseTerminal(m_runParameters.inferior.runMode == ApplicationLauncher::Console);
     }
 
     if (auto aspect = runConfig ? runConfig->extraAspect<DebuggerRunConfigurationAspect>() : nullptr) {
@@ -760,16 +782,6 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit)
         m_runParameters.multiProcess = aspect->useMultiProcess();
     }
 
-    if (runConfig)
-        m_runParameters.displayName = runConfig->displayName();
-
-    if (runConfig && !kit)
-        kit = runConfig->target()->kit();
-    QTC_ASSERT(kit, return);
-
-    m_runParameters.macroExpander = kit->macroExpander();
-
-    m_runParameters.debugger = DebuggerKitInformation::runnable(kit);
     const QByteArray envBinary = qgetenv("QTC_DEBUGGER_PATH");
     if (!envBinary.isEmpty())
         m_runParameters.debugger.executable = QString::fromLocal8Bit(envBinary);
@@ -787,9 +799,6 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, Kit *kit)
     if (ok)
         m_runParameters.nativeMixedEnabled = bool(nativeMixedOverride);
 
-    m_runParameters.cppEngineType = DebuggerKitInformation::engineType(kit);
-    m_runParameters.sysRoot = SysRootKitInformation::sysRoot(kit).toString();
-
     // This will only be shown in some cases, but we don't want to access
     // the kit at that time anymore.
     const QList<Task> tasks = DebuggerKitInformation::validateDebugger(kit);
@@ -842,6 +851,7 @@ DebuggerRunTool::~DebuggerRunTool()
         engine->disconnect();
         delete engine;
     }
+    delete d;
 }
 
 void DebuggerRunTool::showMessage(const QString &msg, int channel, int timeout)
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index b766a6d023d..a0379917af3 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -37,6 +37,11 @@
 
 namespace Debugger {
 
+namespace Internal {
+class TerminalRunner;
+class DebuggerRunToolPrivate;
+} // Internal
+
 class DEBUGGER_EXPORT DebuggerRunTool : public ProjectExplorer::RunWorker
 {
     Q_OBJECT
@@ -128,12 +133,15 @@ public:
     void setTestCase(int testCase);
     void setOverrideStartScript(const QString &script);
 
+    Internal::TerminalRunner *terminalRunner() const;
+
 signals:
     void aboutToNotifyInferiorSetupOk();
 
 private:
     bool fixupParameters();
 
+    Internal::DebuggerRunToolPrivate *d;
     QPointer<Internal::DebuggerEngine> m_engine; // Master engine
     Internal::DebuggerRunParameters m_runParameters;
     bool m_isDying = false;
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 89f57b6d559..7a10520f31c 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -137,11 +137,6 @@ static bool isMostlyHarmlessMessage(const QStringRef &msg)
                   "Invalid argument\\n";
 }
 
-static QString mainFunction(const DebuggerRunParameters &rp)
-{
-    return QLatin1String(rp.toolChainAbi.os() == Abi::WindowsOS && !rp.useTerminal ? "qMain" : "main");
-}
-
 ///////////////////////////////////////////////////////////////////////
 //
 // Debuginfo Taskhandler
@@ -194,8 +189,8 @@ private:
 //
 ///////////////////////////////////////////////////////////////////////
 
-GdbEngine::GdbEngine(bool useTerminal, DebuggerStartMode startMode)
-    : m_startMode(startMode), m_useTerminal(useTerminal), m_terminalTrap(useTerminal)
+GdbEngine::GdbEngine(DebuggerStartMode startMode)
+    : m_startMode(startMode)
 {
     setObjectName("GdbEngine");
 
@@ -221,26 +216,10 @@ GdbEngine::GdbEngine(bool useTerminal, DebuggerStartMode startMode)
     // Output
     connect(&m_outputCollector, &OutputCollector::byteDelivery,
             this, &GdbEngine::readDebuggeeOutput);
-
-    if (isTermEngine()) {
-        if (HostOsInfo::isWindowsHost()) {
-            // Windows up to xp needs a workaround for attaching to freshly started processes. see proc_stub_win
-            if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
-                m_stubProc.setMode(ConsoleProcess::Suspend);
-            else
-                m_stubProc.setMode(ConsoleProcess::Debug);
-        } else {
-            m_stubProc.setMode(ConsoleProcess::Debug);
-            m_stubProc.setSettings(ICore::settings());
-        }
-    }
 }
 
 GdbEngine::~GdbEngine()
 {
-    if (isTermEngine())
-        m_stubProc.disconnect(); // Avoid spurious state transitions from late exiting stub
-
     if (isCoreEngine()) {
         if (m_coreUnpackProcess) {
             m_coreUnpackProcess->blockSignals(true);
@@ -781,9 +760,6 @@ void GdbEngine::interruptInferior()
 
     CHECK_STATE(InferiorStopRequested);
 
-    if (terminal()->sendInterrupt())
-        return;
-
     if (usesExecInterrupt()) {
         runCommand({"-exec-interrupt"});
     } else {
@@ -1079,7 +1055,7 @@ void GdbEngine::handleResultRecord(DebuggerResponse *response)
         Abi abi = rp.toolChainAbi;
         if (abi.os() == Abi::WindowsOS
             && cmd.function.startsWith("attach")
-            && (rp.startMode == AttachExternal || rp.useTerminal))
+            && (rp.startMode == AttachExternal || terminal()))
         {
             // Ignore spurious 'running' responses to 'attach'.
         } else {
@@ -1240,11 +1216,13 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
 {
     // Ignore trap on Windows terminals, which results in
     // spurious "* stopped" message.
-    if (m_terminalTrap && (!data.isValid() || !data["reason"].isValid())
-            && Abi::hostAbi().os() == Abi::WindowsOS) {
-        m_terminalTrap = false;
-        showMessage("IGNORING TERMINAL SIGTRAP", LogMisc);
-        return;
+    if (m_expectTerminalTrap) {
+        m_expectTerminalTrap = false;
+        if ((!data.isValid() || !data["reason"].isValid())
+                && Abi::hostAbi().os() == Abi::WindowsOS) {
+            showMessage("IGNORING TERMINAL SIGTRAP", LogMisc);
+            return;
+        }
     }
 
     if (isDying()) {
@@ -1279,7 +1257,7 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
     // Ignore signals from the process stub.
     const GdbMi frame = data["frame"];
     const QString func = frame["from"].data();
-    if (runParameters().useTerminal
+    if (terminal()
             && data["reason"].data() == "signal-received"
             && data["signal-name"].data() == "SIGSTOP"
             && (func.endsWith("/ld-linux.so.2")
@@ -1371,8 +1349,7 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
         // This is gdb 7+'s initial *stopped in response to attach that
         // appears before the ^done is seen.
         notifyEngineRunAndInferiorStopOk();
-        const DebuggerRunParameters &rp = runParameters();
-        if (rp.useTerminal)
+        if (terminal())
             continueInferiorInternal();
         return;
     } else {
@@ -1497,7 +1474,7 @@ void GdbEngine::handleStop2(const GdbMi &data)
     bool isStopperThread = false;
 
     if (rp.toolChainAbi.os() == Abi::WindowsOS
-            && rp.useTerminal
+            && terminal()
             && reason == "signal-received"
             && data["signal-name"].data() == "SIGTRAP")
     {
@@ -2345,7 +2322,7 @@ QString GdbEngine::breakpointLocation(const BreakpointParameters &data)
     if (data.type == BreakpointAtCatch)
         return QLatin1String("__cxa_begin_catch");
     if (data.type == BreakpointAtMain)
-        return mainFunction(runParameters());
+        return mainFunction();
     if (data.type == BreakpointByFunction)
         return '"' + data.functionName + '"';
     if (data.type == BreakpointByAddress)
@@ -3800,6 +3777,7 @@ void GdbEngine::startGdb(const QStringList &args)
         showMessage("ENABLING TEST CASE: " + QString::number(test));
 
     m_gdbProc.disconnect(); // From any previous runs
+    m_expectTerminalTrap = terminal();
 
     const DebuggerRunParameters &rp = runParameters();
     if (rp.debugger.executable.isEmpty()) {
@@ -3951,8 +3929,8 @@ void GdbEngine::startGdb(const QStringList &args)
     // Don't use ConsoleCommand, otherwise Mac won't markup the output.
     const QString dumperSourcePath = ICore::resourcePath() + "/debugger/";
 
-    if (terminal()->isUsable())
-        runCommand({"set inferior-tty " + QString::fromUtf8(terminal()->slaveDevice())});
+    //if (terminal()->isUsable())
+    //    runCommand({"set inferior-tty " + QString::fromUtf8(terminal()->slaveDevice())});
 
     const QFileInfo gdbBinaryFile(rp.debugger.executable);
     const QString uninstalledData = gdbBinaryFile.absolutePath() + "/data-directory/python";
@@ -3977,9 +3955,7 @@ void GdbEngine::startGdb(const QStringList &args)
 
 void GdbEngine::handleGdbStartFailed()
 {
-    if (isTermEngine())
-        m_stubProc.stop();
-    else if (isPlainEngine())
+    if (isPlainEngine())
         m_outputCollector.shutdown();
 }
 
@@ -4120,7 +4096,7 @@ void GdbEngine::handleInferiorPrepared()
 
     //runCommand("set follow-exec-mode new");
     if (rp.breakOnMain)
-        runCommand({"tbreak " + mainFunction(rp)});
+        runCommand({"tbreak " + mainFunction()});
 
     // Initial attempt to set breakpoints.
     if (rp.startMode != AttachCore) {
@@ -4316,7 +4292,7 @@ void GdbEngine::debugLastCommand()
 
 bool GdbEngine::isPlainEngine() const
 {
-    return !isCoreEngine() && !isAttachEngine() && !isRemoteEngine() && !m_terminalTrap;
+    return !isCoreEngine() && !isAttachEngine() && !isRemoteEngine() && !terminal();
 }
 
 bool GdbEngine::isCoreEngine() const
@@ -4336,7 +4312,7 @@ bool GdbEngine::isAttachEngine() const
 
 bool GdbEngine::isTermEngine() const
 {
-    return !isCoreEngine() && !isAttachEngine() && !isRemoteEngine() && m_terminalTrap;
+    return !isCoreEngine() && !isAttachEngine() && !isRemoteEngine() && terminal();
 }
 
 void GdbEngine::setupEngine()
@@ -4359,30 +4335,7 @@ void GdbEngine::setupEngine()
 
         showMessage("TRYING TO START ADAPTER");
 
-        // Currently, GdbEngines are not re-used
-        //    // We leave the console open, so recycle it now.
-        //    m_stubProc.blockSignals(true);
-        //    m_stubProc.stop();
-        //    m_stubProc.blockSignals(false);
-
-        m_stubProc.setWorkingDirectory(runParameters().inferior.workingDirectory);
-        // Set environment + dumper preload.
-        m_stubProc.setEnvironment(runParameters().stubEnvironment);
-
-        connect(&m_stubProc, &ConsoleProcess::processError,
-                this, &GdbEngine::stubError);
-        connect(&m_stubProc, &ConsoleProcess::processStarted,
-                this, [this] { startGdb(); });
-        connect(&m_stubProc, &ConsoleProcess::stubStopped,
-                this, &GdbEngine::stubExited);
-        // FIXME: Starting the stub implies starting the inferior. This is
-        // fairly unclean as far as the state machine and error reporting go.
-
-        if (!m_stubProc.start(runParameters().inferior.executable,
-                              runParameters().inferior.commandLineArguments)) {
-            // Error message for user is delivered via a signal.
-            handleAdapterStartFailed(QString());
-        }
+        startGdb();
 
     } else if (isCoreEngine()) {
 
@@ -4492,8 +4445,8 @@ void GdbEngine::setupInferior()
 
     } else if (isTermEngine()) {
 
-        const qint64 attachedPID = m_stubProc.applicationPID();
-        const qint64 attachedMainThreadID = m_stubProc.applicationMainThreadID();
+        const qint64 attachedPID = terminal()->applicationPid();
+        const qint64 attachedMainThreadID = terminal()->applicationMainThreadId();
         notifyInferiorPid(ProcessHandle(attachedPID));
         const QString msg = (attachedMainThreadID != -1)
                 ? QString("Going to attach to %1 (%2)").arg(attachedPID).arg(attachedMainThreadID)
@@ -4551,9 +4504,12 @@ void GdbEngine::runEngine()
 
     } else if (isTermEngine()) {
 
-        const qint64 attachedPID = m_stubProc.applicationPID();
+        const qint64 attachedPID = terminal()->applicationPid();
+        const qint64 mainThreadId = terminal()->applicationMainThreadId();
         runCommand({"attach " + QString::number(attachedPID),
-                    [this](const DebuggerResponse &r) { handleStubAttached(r); }});
+                    [this, mainThreadId](const DebuggerResponse &r) {
+                        handleStubAttached(r, mainThreadId);
+                    }});
 
     } else if (isPlainEngine()) {
 
@@ -4911,7 +4867,7 @@ void GdbEngine::handleInterruptInferior(const DebuggerResponse &response)
     }
 }
 
-void GdbEngine::handleStubAttached(const DebuggerResponse &response)
+void GdbEngine::handleStubAttached(const DebuggerResponse &response, qint64 mainThreadId)
 {
     // InferiorStopOk can happen if the "*stopped" in response to the
     // 'attach' comes in before its '^done'
@@ -4923,7 +4879,6 @@ void GdbEngine::handleStubAttached(const DebuggerResponse &response)
         if (runParameters().toolChainAbi.os() == ProjectExplorer::Abi::WindowsOS) {
             QString errorMessage;
             // Resume thread that was suspended by console stub process (see stub code).
-            const qint64 mainThreadId = m_stubProc.applicationMainThreadID();
             if (winResumeThread(mainThreadId, &errorMessage)) {
                 showMessage(QString("Inferior attached, thread %1 resumed").
                             arg(mainThreadId), LogMisc);
@@ -4956,22 +4911,6 @@ void GdbEngine::handleStubAttached(const DebuggerResponse &response)
     }
 }
 
-void GdbEngine::stubError(const QString &msg)
-{
-    AsynchronousMessageBox::critical(tr("Debugger Error"), msg);
-    notifyEngineIll();
-}
-
-void GdbEngine::stubExited()
-{
-    if (state() == EngineShutdownRequested || state() == DebuggerFinished) {
-        showMessage("STUB EXITED EXPECTEDLY");
-    } else {
-        showMessage("STUB EXITED");
-        notifyEngineIll();
-    }
-}
-
 static QString findExecutableFromName(const QString &fileNameFromCore, const QString &coreFile)
 {
     if (fileNameFromCore.isEmpty())
@@ -5212,13 +5151,19 @@ QString GdbEngine::msgPtraceError(DebuggerStartMode sm)
         "For more details, see /etc/sysctl.d/10-ptrace.conf\n");
 }
 
+QString GdbEngine::mainFunction() const
+{
+    const DebuggerRunParameters &rp = runParameters();
+    return QLatin1String(rp.toolChainAbi.os() == Abi::WindowsOS && !terminal() ? "qMain" : "main");
+}
+
 //
 // Factory
 //
 
-DebuggerEngine *createGdbEngine(bool useTerminal, DebuggerStartMode startMode)
+DebuggerEngine *createGdbEngine(DebuggerStartMode startMode)
 {
-    return new GdbEngine(useTerminal, startMode);
+    return new GdbEngine(startMode);
 }
 
 } // namespace Internal
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index a7537cfdebd..554286b9dbd 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -55,6 +55,7 @@ class DebuggerResponse;
 class DisassemblerAgentCookie;
 class GdbMi;
 class MemoryAgentCookie;
+class TerminalRunner;
 
 struct CoreInfo
 {
@@ -71,7 +72,7 @@ class GdbEngine : public DebuggerEngine
     Q_OBJECT
 
 public:
-    explicit GdbEngine(bool useTerminal, DebuggerStartMode startMode);
+    explicit GdbEngine(DebuggerStartMode startMode);
     ~GdbEngine() final;
 
 private: ////////// General Interface //////////
@@ -382,8 +383,7 @@ private: ////////// General Interface //////////
     QString m_currentThread;
     QString m_lastWinException;
     QString m_lastMissingDebugInfo;
-    const bool m_useTerminal;
-    bool m_terminalTrap;
+    bool m_expectTerminalTrap = false;
     bool usesExecInterrupt() const;
     bool usesTargetAsync() const;
 
@@ -441,10 +441,7 @@ private: ////////// General Interface //////////
     void interruptLocalInferior(qint64 pid);
 
     // Terminal
-    void handleStubAttached(const DebuggerResponse &response);
-    void stubExited();
-    void stubError(const QString &msg);
-    Utils::ConsoleProcess m_stubProc;
+    void handleStubAttached(const DebuggerResponse &response, qint64 mainThreadId);
 
     // Core
     void handleTargetCore(const DebuggerResponse &response);
@@ -454,6 +451,7 @@ private: ////////// General Interface //////////
     QString coreName() const;
 
     void continueSetupEngine();
+    QString mainFunction() const;
 
     QString m_executable;
     QString m_coreName;
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index bf00138e9b4..e9f4e78bfb3 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -32,6 +32,7 @@
 #include <debugger/debuggermainwindow.h>
 #include <debugger/debuggerprotocol.h>
 #include <debugger/debuggertooltipmanager.h>
+#include <debugger/terminal.h>
 
 #include <debugger/breakhandler.h>
 #include <debugger/disassemblerlines.h>
@@ -98,7 +99,6 @@ LldbEngine::LldbEngine()
 
 LldbEngine::~LldbEngine()
 {
-    m_stubProc.disconnect(); // Avoid spurious state transitions from late exiting stub
     m_lldbProc.disconnect();
 }
 
@@ -155,8 +155,6 @@ void LldbEngine::shutdownEngine()
 {
     QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
     m_lldbProc.kill();
-    if (runParameters().useTerminal)
-        m_stubProc.stop();
     notifyEngineShutdownOk();
 }
 
@@ -167,48 +165,6 @@ void LldbEngine::abortDebuggerProcess()
 
 void LldbEngine::setupEngine()
 {
-    if (runParameters().useTerminal) {
-        QTC_CHECK(false); // See above.
-        if (HostOsInfo::isWindowsHost()) {
-            // Windows up to xp needs a workaround for attaching to freshly started processes. see proc_stub_win
-            if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
-                m_stubProc.setMode(ConsoleProcess::Suspend);
-            else
-                m_stubProc.setMode(ConsoleProcess::Debug);
-        } else {
-            m_stubProc.setMode(ConsoleProcess::Debug);
-            m_stubProc.setSettings(ICore::settings());
-        }
-
-        QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
-        showMessage("TRYING TO START ADAPTER");
-
-    // Currently, adapters are not re-used
-    //    // We leave the console open, so recycle it now.
-    //    m_stubProc.blockSignals(true);
-    //    m_stubProc.stop();
-    //    m_stubProc.blockSignals(false);
-
-        m_stubProc.setWorkingDirectory(runParameters().inferior.workingDirectory);
-        // Set environment + dumper preload.
-        m_stubProc.setEnvironment(runParameters().stubEnvironment);
-
-        connect(&m_stubProc, &ConsoleProcess::processError, this, &LldbEngine::stubError);
-        connect(&m_stubProc, &ConsoleProcess::processStarted, this, &LldbEngine::stubStarted);
-        connect(&m_stubProc, &ConsoleProcess::stubStopped, this, &LldbEngine::stubExited);
-        // FIXME: Starting the stub implies starting the inferior. This is
-        // fairly unclean as far as the state machine and error reporting go.
-
-        if (!m_stubProc.start(runParameters().inferior.executable,
-                             runParameters().inferior.commandLineArguments)) {
-            // Error message for user is delivered via a signal.
-            //handleAdapterStartFailed(QString());
-            notifyEngineSetupFailed();
-            return;
-        }
-
-    }
-
     QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
     startLldb();
 }
@@ -299,17 +255,17 @@ void LldbEngine::setupInferior()
     DebuggerCommand cmd2("setupInferior");
     cmd2.arg("executable", executable);
     cmd2.arg("breakonmain", rp.breakOnMain);
-    cmd2.arg("useterminal", rp.useTerminal);
+    cmd2.arg("useterminal", bool(terminal()));
     cmd2.arg("startmode", rp.startMode);
     cmd2.arg("nativemixed", isNativeMixedActive());
     cmd2.arg("workingdirectory", rp.inferior.workingDirectory);
     cmd2.arg("environment", rp.inferior.environment.toStringList());
     cmd2.arg("processargs", args.toUnixArgs());
 
-    if (rp.useTerminal) {
+    if (terminal()) {
         QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
-        const qint64 attachedPID = m_stubProc.applicationPID();
-        const qint64 attachedMainThreadID = m_stubProc.applicationMainThreadID();
+        const qint64 attachedPID = terminal()->applicationPid();
+        const qint64 attachedMainThreadID = terminal()->applicationMainThreadId();
         const QString msg = (attachedMainThreadID != -1)
                 ? QString::fromLatin1("Attaching to %1 (%2)").arg(attachedPID).arg(attachedMainThreadID)
                 : QString::fromLatin1("Attaching to %1").arg(attachedPID);
@@ -1100,25 +1056,5 @@ DebuggerEngine *createLldbEngine()
     return new LldbEngine;
 }
 
-void LldbEngine::stubStarted()
-{
-    startLldb();
-}
-
-void LldbEngine::stubError(const QString &msg)
-{
-    AsynchronousMessageBox::critical(tr("Debugger Error"), msg);
-}
-
-void LldbEngine::stubExited()
-{
-    if (state() == EngineShutdownRequested || state() == DebuggerFinished) {
-        showMessage("STUB EXITED EXPECTEDLY");
-        return;
-    }
-    showMessage("STUB EXITED");
-    notifyEngineIll();
-}
-
 } // namespace Internal
 } // namespace Debugger
diff --git a/src/plugins/debugger/lldb/lldbengine.h b/src/plugins/debugger/lldb/lldbengine.h
index dff437497b6..9bc4a0b7c93 100644
--- a/src/plugins/debugger/lldb/lldbengine.h
+++ b/src/plugins/debugger/lldb/lldbengine.h
@@ -154,12 +154,6 @@ private:
 
     QHash<int, DebuggerCommand> m_commandForToken;
     DebuggerCommandSequence m_onStop;
-
-    // Console handling.
-    void stubError(const QString &msg);
-    void stubExited();
-    void stubStarted();
-    Utils::ConsoleProcess m_stubProc;
 };
 
 } // namespace Internal
diff --git a/src/plugins/debugger/terminal.cpp b/src/plugins/debugger/terminal.cpp
index c4f4ba0ba9b..09dcdb156c2 100644
--- a/src/plugins/debugger/terminal.cpp
+++ b/src/plugins/debugger/terminal.cpp
@@ -25,11 +25,16 @@
 
 #include "terminal.h"
 
+#include "debuggerruncontrol.h"
+
 #include <QDebug>
 #include <QIODevice>
 #include <QSocketNotifier>
 
+#include <coreplugin/icore.h>
+
 #include <utils/qtcassert.h>
+#include <utils/hostosinfo.h>
 
 #ifdef Q_OS_UNIX
 #   define DEBUGGER_USE_TERMINAL
@@ -45,6 +50,10 @@
 #   include <sys/stat.h>
 #endif
 
+using namespace Core;
+using namespace ProjectExplorer;
+using namespace Utils;
+
 namespace Debugger {
 namespace Internal {
 
@@ -159,6 +168,67 @@ void Terminal::onSlaveReaderActivated(int fd)
 #endif
 }
 
+TerminalRunner::TerminalRunner(DebuggerRunTool *debugger)
+    : RunWorker(debugger->runControl())
+{
+    setDisplayName("TerminalRunner");
+
+    const DebuggerRunParameters &rp = debugger->runParameters();
+    m_stubRunnable = rp.inferior;
+    m_stubRunnable.environment = rp.stubEnvironment;
+    m_stubRunnable.workingDirectory = rp.inferior.workingDirectory;
+
+    connect(&m_stubProc, &ConsoleProcess::processError,
+            this, &TerminalRunner::stubError);
+    connect(&m_stubProc, &ConsoleProcess::processStarted,
+            this, &TerminalRunner::stubStarted);
+    connect(&m_stubProc, &ConsoleProcess::stubStopped,
+            this, &TerminalRunner::stubExited);
+}
+
+void TerminalRunner::start()
+{
+    m_stubProc.setEnvironment(m_stubRunnable.environment);
+    m_stubProc.setWorkingDirectory(m_stubRunnable.workingDirectory);
+
+    if (HostOsInfo::isWindowsHost()) {
+        // Windows up to xp needs a workaround for attaching to freshly started processes. see proc_stub_win
+        if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
+            m_stubProc.setMode(ConsoleProcess::Suspend);
+        else
+            m_stubProc.setMode(ConsoleProcess::Debug);
+    } else {
+        m_stubProc.setMode(ConsoleProcess::Debug);
+        m_stubProc.setSettings(Core::ICore::settings());
+    }
+
+    // Error message for user is delivered via a signal.
+    m_stubProc.start(m_stubRunnable.executable, m_stubRunnable.commandLineArguments);
+}
+
+void TerminalRunner::stop()
+{
+    m_stubProc.stop();
+    reportStopped();
+}
+
+void TerminalRunner::stubStarted()
+{
+    m_applicationPid = m_stubProc.applicationPID();
+    m_applicationMainThreadId = m_stubProc.applicationMainThreadID();
+    reportStarted();
+}
+
+void TerminalRunner::stubError(const QString &msg)
+{
+    reportFailure(msg);
+}
+
+void TerminalRunner::stubExited()
+{
+    reportStopped();
+}
+
 } // namespace Internal
 } // namespace Debugger
 
diff --git a/src/plugins/debugger/terminal.h b/src/plugins/debugger/terminal.h
index 67b3bf851a5..0745373e0ea 100644
--- a/src/plugins/debugger/terminal.h
+++ b/src/plugins/debugger/terminal.h
@@ -28,7 +28,15 @@
 #include <QCoreApplication>
 #include <QSocketNotifier>
 
+#include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/runnables.h>
+
+#include <utils/consoleprocess.h>
+
 namespace Debugger {
+
+class DebuggerRunTool;
+
 namespace Internal {
 
 class Terminal : public QObject
@@ -60,5 +68,28 @@ private:
     QByteArray m_slaveName;
 };
 
+
+class TerminalRunner : public ProjectExplorer::RunWorker
+{
+public:
+    explicit TerminalRunner(DebuggerRunTool *runControl);
+
+    qint64 applicationPid() const { return m_applicationPid; }
+    qint64 applicationMainThreadId() const { return m_applicationMainThreadId; }
+
+private:
+    void start() final;
+    void stop() final;
+
+    void stubStarted();
+    void stubExited();
+    void stubError(const QString &msg);
+
+    Utils::ConsoleProcess m_stubProc;
+    ProjectExplorer::StandardRunnable m_stubRunnable;
+    qint64 m_applicationPid = 0;
+    qint64 m_applicationMainThreadId = 0;
+};
+
 } // namespace Internal
 } // namespace Debugger

From e3a692a1a4f810ddd487b6773d04e05a8679048e Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 26 Sep 2017 17:19:00 +0200
Subject: [PATCH 29/41] File System view: Fix that projects could be duplicated

It is not possible to use the display name as an ID, because that can
change (and to propagate that change we use the ID).
Remove the display name from the ID, use a separate sort property, and
sort by this property + display name.

Task-number: QTCREATORBUG-18972
Change-Id: I27017473842931defa3a123ce9f41cc8e8ba1a61
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 .../foldernavigationwidget.cpp                | 40 ++++++++++++++-----
 .../projectexplorer/foldernavigationwidget.h  |  1 +
 src/plugins/projectexplorer/session.cpp       | 10 +++--
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index 10ed90d4e0a..9d29ead1a11 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.cpp
+++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp
@@ -56,6 +56,7 @@
 
 const int PATH_ROLE = Qt::UserRole;
 const int ID_ROLE = Qt::UserRole + 1;
+const int SORT_ROLE = Qt::UserRole + 2;
 
 const char PROJECTSDIRECTORYROOT_ID[] = "A.Projects";
 
@@ -170,21 +171,38 @@ void FolderNavigationWidget::toggleAutoSynchronization()
     setAutoSynchronization(!m_autoSync);
 }
 
+static bool itemLessThan(QComboBox *combo,
+                         int index,
+                         const FolderNavigationWidgetFactory::RootDirectory &directory)
+{
+    return combo->itemData(index, SORT_ROLE).toInt() < directory.sortValue
+           || (combo->itemData(index, SORT_ROLE).toInt() == directory.sortValue
+               && combo->itemData(index, Qt::DisplayRole).toString() < directory.displayName);
+}
+
 void FolderNavigationWidget::insertRootDirectory(
     const FolderNavigationWidgetFactory::RootDirectory &directory)
 {
-    // insert sorted
+    // Find existing. Do not remove yet, to not mess up the current selection.
+    int previousIndex = 0;
+    while (previousIndex < m_rootSelector->count()
+           && m_rootSelector->itemData(previousIndex, ID_ROLE).toString() != directory.id)
+        ++previousIndex;
+    // Insert sorted.
     int index = 0;
-    while (index < m_rootSelector->count()
-           && m_rootSelector->itemData(index, ID_ROLE).toString() < directory.id)
+    while (index < m_rootSelector->count() && itemLessThan(m_rootSelector, index, directory))
         ++index;
-    if (m_rootSelector->itemData(index, ID_ROLE).toString() != directory.id)
-        m_rootSelector->insertItem(index, directory.displayName);
+    m_rootSelector->insertItem(index, directory.displayName);
+    if (index <= previousIndex) // item was inserted, update previousIndex
+        ++previousIndex;
     m_rootSelector->setItemData(index, qVariantFromValue(directory.path), PATH_ROLE);
     m_rootSelector->setItemData(index, directory.id, ID_ROLE);
+    m_rootSelector->setItemData(index, directory.sortValue, SORT_ROLE);
     m_rootSelector->setItemData(index, directory.path.toUserOutput(), Qt::ToolTipRole);
-    if (m_rootSelector->currentIndex() == index)
-        setRootDirectory(directory.path);
+    if (m_rootSelector->currentIndex() == previousIndex)
+        m_rootSelector->setCurrentIndex(index);
+    if (previousIndex < m_rootSelector->count())
+        m_rootSelector->removeItem(previousIndex);
     if (m_autoSync) // we might find a better root for current selection now
         setCurrentEditor(Core::EditorManager::currentEditor());
 }
@@ -357,9 +375,12 @@ FolderNavigationWidgetFactory::FolderNavigationWidgetFactory()
     setPriority(400);
     setId("File System");
     setActivationSequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+Y") : tr("Alt+Y")));
-    insertRootDirectory(
-        {QLatin1String("A.Computer"), FolderNavigationWidget::tr("Computer"), Utils::FileName()});
+    insertRootDirectory({QLatin1String("A.Computer"),
+                         0 /*sortValue*/,
+                         FolderNavigationWidget::tr("Computer"),
+                         Utils::FileName()});
     insertRootDirectory({QLatin1String("A.Home"),
+                         10 /*sortValue*/,
                          FolderNavigationWidget::tr("Home"),
                          Utils::FileName::fromString(QDir::homePath())});
     updateProjectsDirectoryRoot();
@@ -440,6 +461,7 @@ int FolderNavigationWidgetFactory::rootIndex(const QString &id)
 void FolderNavigationWidgetFactory::updateProjectsDirectoryRoot()
 {
     insertRootDirectory({QLatin1String(PROJECTSDIRECTORYROOT_ID),
+                         20 /*sortValue*/,
                          FolderNavigationWidget::tr("Projects"),
                          Core::DocumentManager::projectsDirectory()});
 }
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.h b/src/plugins/projectexplorer/foldernavigationwidget.h
index 06c91c17185..11e2bbc9ec8 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.h
+++ b/src/plugins/projectexplorer/foldernavigationwidget.h
@@ -53,6 +53,7 @@ class FolderNavigationWidgetFactory : public Core::INavigationWidgetFactory
 public:
     struct RootDirectory {
         QString id;
+        int sortValue;
         QString displayName;
         Utils::FileName path;
     };
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index cd66c88caea..6d7a4ef7641 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -120,9 +120,11 @@ static SessionManagerPrivate *d = nullptr;
 
 static QString projectFolderId(Project *pro)
 {
-    return "P." + pro->displayName() + "." + pro->projectFilePath().toString();
+    return pro->projectFilePath().toString();
 }
 
+const int PROJECT_SORT_VALUE = 100;
+
 SessionManager::SessionManager(QObject *parent) : QObject(parent)
 {
     m_instance = this;
@@ -392,8 +394,10 @@ void SessionManager::addProject(Project *pro)
 
     emit m_instance->projectAdded(pro);
     const auto updateFolderNavigation = [pro] {
-        FolderNavigationWidgetFactory::insertRootDirectory(
-            {projectFolderId(pro), pro->displayName(), pro->projectFilePath().parentDir()});
+        FolderNavigationWidgetFactory::insertRootDirectory({projectFolderId(pro),
+                                                            PROJECT_SORT_VALUE,
+                                                            pro->displayName(),
+                                                            pro->projectFilePath().parentDir()});
     };
     updateFolderNavigation();
     configureEditors(pro);

From 7c064d39211c5e63fb76aa7e27e20f936e6dcaba Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Mon, 25 Sep 2017 15:31:08 +0200
Subject: [PATCH 30/41] CorePlugin: Clean forward declaration

Change-Id: I37c381bc26a29acae1bfe0e49f2772b4e92cf046
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/coreplugin/actionmanager/actionmanager.h   |  1 -
 src/plugins/coreplugin/actionmanager/actionmanager_p.h |  6 ------
 src/plugins/coreplugin/actionmanager/commandmappings.h |  1 -
 src/plugins/coreplugin/basefilewizardfactory.h         |  2 --
 src/plugins/coreplugin/coreplugin.h                    |  1 -
 src/plugins/coreplugin/dialogs/newdialog.h             |  1 -
 src/plugins/coreplugin/dialogs/openwithdialog.h        |  1 -
 src/plugins/coreplugin/dialogs/saveitemsdialog.h       |  6 ------
 src/plugins/coreplugin/dialogs/shortcutsettings.h      |  2 --
 src/plugins/coreplugin/documentmanager.h               |  4 ----
 src/plugins/coreplugin/editormanager/editormanager.h   | 10 ----------
 src/plugins/coreplugin/editormanager/editorview.h      |  4 ----
 .../coreplugin/editormanager/openeditorswindow.h       |  2 --
 src/plugins/coreplugin/find/searchresultwindow.h       |  2 --
 src/plugins/coreplugin/icore.h                         |  2 --
 src/plugins/coreplugin/locator/locatorsettingspage.h   |  1 -
 src/plugins/coreplugin/locator/locatorwidget.h         |  3 ---
 src/plugins/coreplugin/mainwindow.h                    |  3 ---
 src/plugins/coreplugin/navigationwidget.h              |  1 -
 src/plugins/coreplugin/outputpanemanager.h             |  2 --
 src/plugins/coreplugin/rightpane.h                     |  1 -
 src/plugins/coreplugin/sidebarwidget.h                 |  2 --
 22 files changed, 58 deletions(-)

diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h
index 2f29eac491a..e8c661b9899 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.h
@@ -35,7 +35,6 @@
 
 QT_BEGIN_NAMESPACE
 class QAction;
-class QSettings;
 class QString;
 QT_END_NAMESPACE
 
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager_p.h b/src/plugins/coreplugin/actionmanager/actionmanager_p.h
index 0269fc4992e..5ac100ba784 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager_p.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h
@@ -34,18 +34,12 @@
 #include <QMultiHash>
 #include <QTimer>
 
-QT_BEGIN_NAMESPACE
-class QLabel;
-class QSettings;
-QT_END_NAMESPACE
-
 namespace Core {
 
 namespace Internal {
 
 class Action;
 class ActionContainerPrivate;
-class MainWindow;
 
 class ActionManagerPrivate : public QObject
 {
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.h b/src/plugins/coreplugin/actionmanager/commandmappings.h
index 89abe7efb08..ddfd7ff2809 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.h
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.h
@@ -30,7 +30,6 @@
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
-class QLineEdit;
 class QTreeWidget;
 class QTreeWidgetItem;
 QT_END_NAMESPACE
diff --git a/src/plugins/coreplugin/basefilewizardfactory.h b/src/plugins/coreplugin/basefilewizardfactory.h
index 61972f17e16..8e68fb07221 100644
--- a/src/plugins/coreplugin/basefilewizardfactory.h
+++ b/src/plugins/coreplugin/basefilewizardfactory.h
@@ -34,10 +34,8 @@
 #include <QVariantMap>
 
 QT_BEGIN_NAMESPACE
-class QIcon;
 class QWizard;
 class QWizardPage;
-class QDebug;
 QT_END_NAMESPACE
 
 namespace Utils { class Wizard; }
diff --git a/src/plugins/coreplugin/coreplugin.h b/src/plugins/coreplugin/coreplugin.h
index 7a69887c36a..2f86226a711 100644
--- a/src/plugins/coreplugin/coreplugin.h
+++ b/src/plugins/coreplugin/coreplugin.h
@@ -35,7 +35,6 @@ QT_END_NAMESPACE
 
 namespace Utils {
 class PathChooser;
-class Theme;
 }
 
 namespace Core {
diff --git a/src/plugins/coreplugin/dialogs/newdialog.h b/src/plugins/coreplugin/dialogs/newdialog.h
index 5d73546aa96..9461efae261 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.h
+++ b/src/plugins/coreplugin/dialogs/newdialog.h
@@ -39,7 +39,6 @@ class QSortFilterProxyModel;
 class QPushButton;
 class QStandardItem;
 class QStandardItemModel;
-class QStringList;
 QT_END_NAMESPACE
 
 namespace Core {
diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.h b/src/plugins/coreplugin/dialogs/openwithdialog.h
index d93ea71d6d2..a3f0db0366f 100644
--- a/src/plugins/coreplugin/dialogs/openwithdialog.h
+++ b/src/plugins/coreplugin/dialogs/openwithdialog.h
@@ -30,7 +30,6 @@
 
 namespace Core {
 
-class ICore;
 
 namespace Internal {
 
diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.h b/src/plugins/coreplugin/dialogs/saveitemsdialog.h
index 1048ca03481..37d321fade8 100644
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.h
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.h
@@ -30,18 +30,12 @@
 
 #include "ui_saveitemsdialog.h"
 
-QT_BEGIN_NAMESPACE
-class QCheckBox;
-QT_END_NAMESPACE
-
 namespace Core {
 
 class IDocument;
-class EditorManager;
 
 namespace Internal {
 
-class MainWindow;
 
 class SaveItemsDialog : public QDialog
 {
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h
index 4607d68419f..c3359f00648 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.h
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h
@@ -36,7 +36,6 @@
 
 QT_BEGIN_NAMESPACE
 class QGroupBox;
-class QKeyEvent;
 class QLabel;
 QT_END_NAMESPACE
 
@@ -47,7 +46,6 @@ class Command;
 namespace Internal {
 
 class ActionManagerPrivate;
-class MainWindow;
 
 struct ShortcutItem
 {
diff --git a/src/plugins/coreplugin/documentmanager.h b/src/plugins/coreplugin/documentmanager.h
index 052a7ee7bd4..3cf9b47bfe7 100644
--- a/src/plugins/coreplugin/documentmanager.h
+++ b/src/plugins/coreplugin/documentmanager.h
@@ -32,16 +32,12 @@
 
 QT_BEGIN_NAMESPACE
 class QStringList;
-class QAction;
-class QMainWindow;
-class QMenu;
 QT_END_NAMESPACE
 
 namespace Utils { class FileName; }
 
 namespace Core {
 
-class IContext;
 class IDocument;
 
 namespace Internal {
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index 7c28c27eb70..7b467ac1ac0 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -41,15 +41,10 @@ namespace Utils { class MimeType; }
 
 namespace Core {
 
-class IContext;
 class IEditor;
 class IEditorFactory;
 class IExternalEditor;
 class IDocument;
-class IMode;
-class IVersionControl;
-
-class EditorToolBar;
 class SearchResultItem;
 
 enum MakeWritableResult {
@@ -60,13 +55,8 @@ enum MakeWritableResult {
 };
 
 namespace Internal {
-class EditorClosingCoreListener;
 class EditorManagerPrivate;
-class EditorView;
 class MainWindow;
-class OpenEditorsViewFactory;
-class OpenEditorsWindow;
-class SplitterOrView;
 } // namespace Internal
 
 class CORE_EXPORT EditorManagerPlaceHolder : public QWidget
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index abeb0f125e6..6653616efd8 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -41,8 +41,6 @@
 #include <functional>
 
 QT_BEGIN_NAMESPACE
-class QAction;
-class QComboBox;
 class QFrame;
 class QLabel;
 class QMenu;
@@ -53,11 +51,9 @@ class QToolButton;
 QT_END_NAMESPACE
 
 namespace Core {
-class IContext;
 class IDocument;
 class IEditor;
 class InfoBarDisplay;
-class DocumentModel;
 class EditorToolBar;
 
 namespace Internal {
diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.h b/src/plugins/coreplugin/editormanager/openeditorswindow.h
index e497411b771..9bd769bf8cc 100644
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.h
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.h
@@ -39,7 +39,6 @@ QT_END_NAMESPACE
 
 namespace Core {
 
-class IDocument;
 class IEditor;
 
 namespace Internal {
@@ -51,7 +50,6 @@ public:
     QSize sizeHint() const;
 };
 
-class EditorHistoryItem;
 
 class OpenEditorsWindow : public QFrame
 {
diff --git a/src/plugins/coreplugin/find/searchresultwindow.h b/src/plugins/coreplugin/find/searchresultwindow.h
index f62c2163110..a22f6ad0a22 100644
--- a/src/plugins/coreplugin/find/searchresultwindow.h
+++ b/src/plugins/coreplugin/find/searchresultwindow.h
@@ -39,11 +39,9 @@ QT_END_NAMESPACE
 
 namespace Core {
 namespace Internal {
-    class SearchResultTreeView;
     class SearchResultWindowPrivate;
     class SearchResultWidget;
 }
-class Find;
 class SearchResultWindow;
 
 class CORE_EXPORT SearchResult : public QObject
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h
index b2d789b6d8d..89c6ada1808 100644
--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -44,9 +44,7 @@ namespace Core {
 class IWizardFactory;
 class Context;
 class IContext;
-class ProgressManager;
 class SettingsDatabase;
-class VcsManager;
 
 namespace Internal { class MainWindow; }
 
diff --git a/src/plugins/coreplugin/locator/locatorsettingspage.h b/src/plugins/coreplugin/locator/locatorsettingspage.h
index f9e4383d466..ed7143ae584 100644
--- a/src/plugins/coreplugin/locator/locatorsettingspage.h
+++ b/src/plugins/coreplugin/locator/locatorsettingspage.h
@@ -34,7 +34,6 @@
 #include <QPointer>
 
 QT_BEGIN_NAMESPACE
-class QListWidgetItem;
 class QSortFilterProxyModel;
 QT_END_NAMESPACE
 
diff --git a/src/plugins/coreplugin/locator/locatorwidget.h b/src/plugins/coreplugin/locator/locatorwidget.h
index c4ce3c4a14d..6b645134cce 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.h
+++ b/src/plugins/coreplugin/locator/locatorwidget.h
@@ -34,10 +34,7 @@
 
 QT_BEGIN_NAMESPACE
 class QAction;
-class QLabel;
-class QLineEdit;
 class QMenu;
-class QTreeView;
 QT_END_NAMESPACE
 
 namespace Utils { class FancyLineEdit; }
diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h
index 7a7042fd36a..a50fa8b6a7c 100644
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -37,7 +37,6 @@
 #include <functional>
 
 QT_BEGIN_NAMESPACE
-class QSettings;
 class QPrinter;
 class QToolButton;
 QT_END_NAMESPACE
@@ -47,10 +46,8 @@ namespace Core {
 class StatusBarWidget;
 class EditorManager;
 class ExternalToolManager;
-class DocumentManager;
 class HelpManager;
 class IDocument;
-class IWizardFactory;
 class JsExpander;
 class MessageManager;
 class ModeManager;
diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h
index e2b49ee95c0..0f43e4ce042 100644
--- a/src/plugins/coreplugin/navigationwidget.h
+++ b/src/plugins/coreplugin/navigationwidget.h
@@ -33,7 +33,6 @@
 QT_BEGIN_NAMESPACE
 class QSettings;
 class QAbstractItemModel;
-class QStandardItemModel;
 QT_END_NAMESPACE
 
 namespace Core {
diff --git a/src/plugins/coreplugin/outputpanemanager.h b/src/plugins/coreplugin/outputpanemanager.h
index b8885dd21d0..90dc7b04a0d 100644
--- a/src/plugins/coreplugin/outputpanemanager.h
+++ b/src/plugins/coreplugin/outputpanemanager.h
@@ -32,9 +32,7 @@
 
 QT_BEGIN_NAMESPACE
 class QAction;
-class QComboBox;
 class QLabel;
-class QSplitter;
 class QStackedWidget;
 class QTimeLine;
 class QLabel;
diff --git a/src/plugins/coreplugin/rightpane.h b/src/plugins/coreplugin/rightpane.h
index 4fb410f5eb9..ab3aab18e7d 100644
--- a/src/plugins/coreplugin/rightpane.h
+++ b/src/plugins/coreplugin/rightpane.h
@@ -36,7 +36,6 @@ QT_END_NAMESPACE
 
 namespace Core {
 
-class IMode;
 class RightPaneWidget;
 
 class CORE_EXPORT RightPanePlaceHolder : public QWidget
diff --git a/src/plugins/coreplugin/sidebarwidget.h b/src/plugins/coreplugin/sidebarwidget.h
index fbc6c09acca..e6db3c22006 100644
--- a/src/plugins/coreplugin/sidebarwidget.h
+++ b/src/plugins/coreplugin/sidebarwidget.h
@@ -28,10 +28,8 @@
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
-class QSettings;
 class QToolBar;
 class QAction;
-class QToolButton;
 QT_END_NAMESPACE
 
 namespace Core {

From 3ddba62aff34823001813a90e57285afcc48c4e9 Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Wed, 27 Sep 2017 10:41:45 +0200
Subject: [PATCH 31/41] Valgrind: fix forward declaration

Change-Id: I6fe6a903451a40214224319a5245d57488d9cf05
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/valgrind/callgrindvisualisation.h | 1 -
 src/plugins/valgrind/xmlprotocol/error.h      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/plugins/valgrind/callgrindvisualisation.h b/src/plugins/valgrind/callgrindvisualisation.h
index cbb38ca6e51..f03b4775b58 100644
--- a/src/plugins/valgrind/callgrindvisualisation.h
+++ b/src/plugins/valgrind/callgrindvisualisation.h
@@ -29,7 +29,6 @@
 
 QT_BEGIN_NAMESPACE
 class QAbstractItemModel;
-class QModelIndex;
 QT_END_NAMESPACE
 
 namespace Valgrind {
diff --git a/src/plugins/valgrind/xmlprotocol/error.h b/src/plugins/valgrind/xmlprotocol/error.h
index f7b56f301f9..8a235348b1f 100644
--- a/src/plugins/valgrind/xmlprotocol/error.h
+++ b/src/plugins/valgrind/xmlprotocol/error.h
@@ -37,7 +37,6 @@ QT_END_NAMESPACE
 namespace Valgrind {
 namespace XmlProtocol {
 
-class Frame;
 class Stack;
 class Suppression;
 

From 3edc50a1644d142a29e3d72273d5e22866552efd Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 26 Sep 2017 15:03:57 +0200
Subject: [PATCH 32/41] README.md: Update Clang repository URLs

Change-Id: I5112052032e128144b346fac49076a458647f7db
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 87bc9e34fbe..dbaa481626e 100644
--- a/README.md
+++ b/README.md
@@ -242,14 +242,14 @@ http://llvm.org/docs/GettingStarted.html#git-mirror:
 
    1. Clone LLVM and switch to a suitable branch
 
-          git clone http://llvm.org/git/llvm.git
+          git clone https://git.llvm.org/git/llvm.git/
           cd llvm
           git checkout release_39
 
    2. Clone Clang into llvm/tools/clang and switch to a suitable branch
 
           cd tools
-          git clone http://llvm.org/git/clang.git
+          git clone https://git.llvm.org/git/clang.git/
           cd clang
           git checkout release_39
 

From ac6055eeb06d88f848468d25ff4a053e4f8dc0f0 Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Wed, 27 Sep 2017 10:05:33 +0200
Subject: [PATCH 33/41] Git: clean forward declaration

Change-Id: Ic8e988d9fa27f9e92fdcfe111220a5c929998afb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/git/branchdialog.h          | 1 -
 src/plugins/git/changeselectiondialog.h | 4 ----
 src/plugins/git/gerrit/gerritmodel.h    | 4 ----
 src/plugins/git/gerrit/gerritplugin.h   | 4 ----
 src/plugins/git/gitclient.h             | 1 -
 src/plugins/git/giteditor.h             | 4 ----
 src/plugins/git/gitplugin.h             | 3 ---
 src/plugins/git/gitsubmiteditor.h       | 1 -
 src/plugins/git/mergetool.h             | 2 --
 src/plugins/git/remotemodel.h           | 2 --
 src/plugins/git/settingspage.h          | 4 ----
 src/plugins/git/stashdialog.h           | 1 -
 12 files changed, 31 deletions(-)

diff --git a/src/plugins/git/branchdialog.h b/src/plugins/git/branchdialog.h
index a967dc3bdf4..9d95dd59dac 100644
--- a/src/plugins/git/branchdialog.h
+++ b/src/plugins/git/branchdialog.h
@@ -36,7 +36,6 @@ namespace Internal {
 
 namespace Ui { class BranchDialog; }
 
-class BranchAddDialog;
 class BranchModel;
 
 /**
diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h
index 5fad19b836c..b87ce10eede 100644
--- a/src/plugins/git/changeselectiondialog.h
+++ b/src/plugins/git/changeselectiondialog.h
@@ -33,10 +33,6 @@
 #include <QProcessEnvironment>
 
 QT_BEGIN_NAMESPACE
-class QPushButton;
-class QLabel;
-class QLineEdit;
-class QPlainTextEdit;
 class QProcess;
 class QStringListModel;
 QT_END_NAMESPACE
diff --git a/src/plugins/git/gerrit/gerritmodel.h b/src/plugins/git/gerrit/gerritmodel.h
index d9efd0edd25..213de67db93 100644
--- a/src/plugins/git/gerrit/gerritmodel.h
+++ b/src/plugins/git/gerrit/gerritmodel.h
@@ -32,10 +32,6 @@
 #include <QSharedPointer>
 #include <QDateTime>
 
-QT_BEGIN_NAMESPACE
-class QUrl;
-QT_END_NAMESPACE
-
 namespace Gerrit {
 namespace Internal {
 class QueryContext;
diff --git a/src/plugins/git/gerrit/gerritplugin.h b/src/plugins/git/gerrit/gerritplugin.h
index 2915f9b2b3c..404a2c9f255 100644
--- a/src/plugins/git/gerrit/gerritplugin.h
+++ b/src/plugins/git/gerrit/gerritplugin.h
@@ -32,10 +32,6 @@
 #include <QSharedPointer>
 #include <QPair>
 
-QT_BEGIN_NAMESPACE
-class QAction;
-QT_END_NAMESPACE
-
 namespace Core {
 class ActionContainer;
 class Command;
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 7563f24531b..92988be65da 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -53,7 +53,6 @@ namespace VcsBase {
 }
 
 namespace DiffEditor {
-class DiffEditorDocument;
 class DiffEditorController;
 }
 
diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h
index d776d2ff5de..f074f8fedda 100644
--- a/src/plugins/git/giteditor.h
+++ b/src/plugins/git/giteditor.h
@@ -29,10 +29,6 @@
 
 #include <QRegExp>
 
-QT_BEGIN_NAMESPACE
-class QVariant;
-QT_END_NAMESPACE
-
 namespace Git {
 namespace Internal {
 
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index 790f0959a8f..2772cddcb90 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -39,9 +39,7 @@
 #include <functional>
 
 QT_BEGIN_NAMESPACE
-class QFile;
 class QAction;
-class QFileInfo;
 QT_END_NAMESPACE
 
 namespace Core {
@@ -61,7 +59,6 @@ namespace Internal {
 
 class GitVersionControl;
 class GitClient;
-class GitSubmitEditor;
 class CommitData;
 class StashDialog;
 class BranchDialog;
diff --git a/src/plugins/git/gitsubmiteditor.h b/src/plugins/git/gitsubmiteditor.h
index 04f031901e5..40948f3b984 100644
--- a/src/plugins/git/gitsubmiteditor.h
+++ b/src/plugins/git/gitsubmiteditor.h
@@ -37,7 +37,6 @@ namespace VcsBase { class SubmitFileModel; }
 namespace Git {
 namespace Internal {
 
-class GitClient;
 class GitSubmitEditorWidget;
 class GitSubmitEditorPanelData;
 
diff --git a/src/plugins/git/mergetool.h b/src/plugins/git/mergetool.h
index f905cf25a03..d5d3d45f645 100644
--- a/src/plugins/git/mergetool.h
+++ b/src/plugins/git/mergetool.h
@@ -36,8 +36,6 @@ QT_END_NAMESPACE
 namespace Git {
 namespace Internal {
 
-class GitClient;
-
 class MergeTool : public QObject
 {
     Q_OBJECT
diff --git a/src/plugins/git/remotemodel.h b/src/plugins/git/remotemodel.h
index 467d9de3b5a..6ac83e32faf 100644
--- a/src/plugins/git/remotemodel.h
+++ b/src/plugins/git/remotemodel.h
@@ -32,8 +32,6 @@
 namespace Git {
 namespace Internal {
 
-class GitClient;
-
 class RemoteModel : public QAbstractTableModel {
     Q_OBJECT
 public:
diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h
index 205bda707e6..3e2ca9087d6 100644
--- a/src/plugins/git/settingspage.h
+++ b/src/plugins/git/settingspage.h
@@ -32,10 +32,6 @@
 #include <QPointer>
 #include <QWidget>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
-
 namespace VcsBase {
 class VcsBaseClientSettings;
 } // namespace VcsBase
diff --git a/src/plugins/git/stashdialog.h b/src/plugins/git/stashdialog.h
index a64857b3180..bf725090947 100644
--- a/src/plugins/git/stashdialog.h
+++ b/src/plugins/git/stashdialog.h
@@ -30,7 +30,6 @@
 QT_BEGIN_NAMESPACE
 class QSortFilterProxyModel;
 class QPushButton;
-class QModelIndex;
 QT_END_NAMESPACE
 
 namespace Git {

From b11f304ffba06354a78c9336d9c8c0babea8d5e0 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 26 Sep 2017 10:34:03 +0200
Subject: [PATCH 34/41] Debugger: Remove more non-const acccess to start
 parameters

Change-Id: I1311b652bb56ef4b9b51cca6b39be2b2215e0074
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/debuggerruncontrol.cpp | 5 -----
 src/plugins/debugger/debuggerruncontrol.h   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 1ab8198fcd1..4953efe54bf 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -575,11 +575,6 @@ void DebuggerRunTool::debuggingFinished()
     reportStopped();
 }
 
-DebuggerRunParameters &DebuggerRunTool::runParameters()
-{
-    return m_runParameters;
-}
-
 const DebuggerRunParameters &DebuggerRunTool::runParameters() const
 {
     return m_runParameters;
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index a0379917af3..794ee3ee6b6 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -69,7 +69,6 @@ public:
     void abortDebugger();
     void debuggingFinished();
 
-    Internal::DebuggerRunParameters &runParameters();
     const Internal::DebuggerRunParameters &runParameters() const;
 
     void startDying() { m_isDying = true; }

From 0c8283234aceefb721613a4b0353f680b2e4be79 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 26 Sep 2017 15:22:14 +0200
Subject: [PATCH 35/41] Debugger: Simplify GdbEngine construction

Change-Id: I4af1cb7d7480b1db68693881254cbc89d985c33e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/debuggerruncontrol.cpp | 4 ++--
 src/plugins/debugger/gdb/gdbengine.cpp      | 9 +++++----
 src/plugins/debugger/gdb/gdbengine.h        | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 4953efe54bf..5d9870d8679 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -77,7 +77,7 @@ namespace Debugger {
 namespace Internal {
 
 DebuggerEngine *createCdbEngine(QStringList *error, DebuggerStartMode sm);
-DebuggerEngine *createGdbEngine(DebuggerStartMode sm);
+DebuggerEngine *createGdbEngine();
 DebuggerEngine *createPdbEngine();
 DebuggerEngine *createQmlEngine(bool useTerminal);
 DebuggerEngine *createQmlCppEngine(DebuggerEngine *cppEngine, bool useTerminal);
@@ -482,7 +482,7 @@ void DebuggerRunTool::start()
 
     switch (m_runParameters.cppEngineType) {
         case GdbEngineType:
-            cppEngine = createGdbEngine(m_runParameters.startMode);
+            cppEngine = createGdbEngine();
             break;
         case CdbEngineType: {
             QStringList errors;
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 7a10520f31c..2370d6f22f9 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -189,8 +189,7 @@ private:
 //
 ///////////////////////////////////////////////////////////////////////
 
-GdbEngine::GdbEngine(DebuggerStartMode startMode)
-    : m_startMode(startMode)
+GdbEngine::GdbEngine()
 {
     setObjectName("GdbEngine");
 
@@ -4317,6 +4316,8 @@ bool GdbEngine::isTermEngine() const
 
 void GdbEngine::setupEngine()
 {
+    m_startMode = runParameters().startMode;
+
     CHECK_STATE(EngineSetupRequested);
     showMessage("TRYING TO START ADAPTER");
 
@@ -5161,9 +5162,9 @@ QString GdbEngine::mainFunction() const
 // Factory
 //
 
-DebuggerEngine *createGdbEngine(DebuggerStartMode startMode)
+DebuggerEngine *createGdbEngine()
 {
-    return new GdbEngine(startMode);
+    return new GdbEngine;
 }
 
 } // namespace Internal
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 554286b9dbd..506f68c34c6 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -72,7 +72,7 @@ class GdbEngine : public DebuggerEngine
     Q_OBJECT
 
 public:
-    explicit GdbEngine(DebuggerStartMode startMode);
+    GdbEngine();
     ~GdbEngine() final;
 
 private: ////////// General Interface //////////
@@ -92,7 +92,6 @@ private: ////////// General Interface //////////
 
     ////////// General State //////////
 
-    const DebuggerStartMode m_startMode;
     bool m_registerNamesListed = false;
 
     ////////// Gdb Process Management //////////
@@ -462,6 +461,7 @@ private: ////////// General Interface //////////
     Utils::QtcProcess m_gdbProc;
     OutputCollector m_outputCollector;
     QString m_errorString;
+    DebuggerStartMode m_startMode = NoStartMode;
 };
 
 } // namespace Internal

From 67646cb02639f42fcb850c672c35dd2e39e218c4 Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Wed, 27 Sep 2017 10:02:06 +0200
Subject: [PATCH 36/41] autotoolsprojectmanager: fix forward declaration

Change-Id: If710c026bb40735a4437cce8ca3e7c32c619d202
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/autotoolsprojectmanager/autotoolsproject.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.h b/src/plugins/autotoolsprojectmanager/autotoolsproject.h
index 2183ee92b73..b9016bdcc04 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h
@@ -39,7 +39,6 @@ namespace AutotoolsProjectManager {
 namespace Internal {
 
 class MakefileParserThread;
-class AutotoolsTarget;
 
 /**
  * @brief Implementation of the ProjectExplorer::Project interface.

From f75379ddcfd95a1f8966a9b2843d82766ae872eb Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Wed, 27 Sep 2017 10:08:30 +0200
Subject: [PATCH 37/41] Mercurial: fix forward declaration

Change-Id: Iacd804231c84881de553e6b5d7d66f6b8731e70e
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/mercurial/mercurialclient.h | 1 -
 src/plugins/mercurial/mercurialplugin.h | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/src/plugins/mercurial/mercurialclient.h b/src/plugins/mercurial/mercurialclient.h
index e3763439a35..8f23e0d76ef 100644
--- a/src/plugins/mercurial/mercurialclient.h
+++ b/src/plugins/mercurial/mercurialclient.h
@@ -30,7 +30,6 @@
 
 namespace Mercurial {
 namespace Internal {
-class MercurialDiffParameters;
 
 class MercurialClient : public VcsBase::VcsBaseClient
 {
diff --git a/src/plugins/mercurial/mercurialplugin.h b/src/plugins/mercurial/mercurialplugin.h
index 231f03effc4..890238b3752 100644
--- a/src/plugins/mercurial/mercurialplugin.h
+++ b/src/plugins/mercurial/mercurialplugin.h
@@ -37,11 +37,7 @@ QT_END_NAMESPACE
 
 namespace Core {
 class ActionContainer;
-class ActionManager;
 class CommandLocator;
-class ICore;
-class Id;
-class IEditor;
 } // namespace Core
 
 namespace Utils { class ParameterAction; }
@@ -52,9 +48,6 @@ namespace Internal {
 
 class OptionsPage;
 class MercurialClient;
-class MercurialControl;
-class MercurialEditorWidget;
-class MercurialSettings;
 
 class MercurialPlugin : public VcsBase::VcsBasePlugin
 {

From 8883d496b347b2c595012aefb4d3484e25dec4e7 Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Wed, 27 Sep 2017 15:20:18 +0200
Subject: [PATCH 38/41] Help: fix forward declaration

Change-Id: I88b5cca65d7e98e7f9d9e5d082cc137e822bc9b4
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/help/centralwidget.h       | 2 --
 src/plugins/help/generalsettingspage.h | 1 -
 src/plugins/help/helpplugin.h          | 7 -------
 src/plugins/help/helpwidget.h          | 1 -
 src/plugins/help/searchwidget.h        | 1 -
 5 files changed, 12 deletions(-)

diff --git a/src/plugins/help/centralwidget.h b/src/plugins/help/centralwidget.h
index 088487e349f..1796088fa97 100644
--- a/src/plugins/help/centralwidget.h
+++ b/src/plugins/help/centralwidget.h
@@ -32,8 +32,6 @@
 namespace Help {
 namespace Internal {
 
-class HelpViewer;
-class PrintHelper;
 
 class CentralWidget : public HelpWidget
 {
diff --git a/src/plugins/help/generalsettingspage.h b/src/plugins/help/generalsettingspage.h
index 0bfca8fdc64..7b5fe53146f 100644
--- a/src/plugins/help/generalsettingspage.h
+++ b/src/plugins/help/generalsettingspage.h
@@ -33,7 +33,6 @@
 namespace Help {
 namespace Internal {
 
-class CentralWidget;
 
 class GeneralSettingsPage : public Core::IOptionsPage
 {
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index d6985733efb..52eb5a73701 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -35,16 +35,11 @@
 #include <QStringList>
 
 QT_BEGIN_NAMESPACE
-class QAction;
-class QMenu;
-class QToolButton;
 class QUrl;
 QT_END_NAMESPACE
 
 namespace Core {
-class MiniSplitter;
 class SideBar;
-class SideBarItem;
 }   // Core
 
 namespace Utils { class StyledBar; }
@@ -54,12 +49,10 @@ namespace Internal {
 class CentralWidget;
 class DocSettingsPage;
 class FilterSettingsPage;
-class GeneralSettingsPage;
 class HelpMode;
 class HelpViewer;
 class LocalHelpManager;
 class OpenPagesManager;
-class SearchWidget;
 class SearchTaskHandler;
 
 class HelpPlugin : public ExtensionSystem::IPlugin
diff --git a/src/plugins/help/helpwidget.h b/src/plugins/help/helpwidget.h
index 3e27d28619c..cd1fffa4244 100644
--- a/src/plugins/help/helpwidget.h
+++ b/src/plugins/help/helpwidget.h
@@ -33,7 +33,6 @@
 QT_BEGIN_NAMESPACE
 class QAction;
 class QComboBox;
-class QFont;
 class QMenu;
 class QPrinter;
 class QStackedWidget;
diff --git a/src/plugins/help/searchwidget.h b/src/plugins/help/searchwidget.h
index d06a597b32a..e0ad8ebab56 100644
--- a/src/plugins/help/searchwidget.h
+++ b/src/plugins/help/searchwidget.h
@@ -34,7 +34,6 @@
 QT_BEGIN_NAMESPACE
 class QHelpSearchEngine;
 class QHelpSearchResultWidget;
-class QMouseEvent;
 class QUrl;
 QT_END_NAMESPACE
 

From b35fe9bf535d9b6d1205ebecd244404189a87692 Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Wed, 27 Sep 2017 15:27:57 +0200
Subject: [PATCH 39/41] timeline: fix forward declaration

Change-Id: Ic69e6559826050adabd3f39e7b936f98d8069621
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/timeline/timelineabstractrenderer.h | 2 --
 src/libs/timeline/timelinerenderer.h         | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/libs/timeline/timelineabstractrenderer.h b/src/libs/timeline/timelineabstractrenderer.h
index 0412371efa3..444e143171c 100644
--- a/src/libs/timeline/timelineabstractrenderer.h
+++ b/src/libs/timeline/timelineabstractrenderer.h
@@ -35,8 +35,6 @@
 
 namespace Timeline {
 
-class TimelineRenderPass;
-class TimelineRenderState;
 
 class TIMELINE_EXPORT TimelineAbstractRenderer : public QQuickItem
 {
diff --git a/src/libs/timeline/timelinerenderer.h b/src/libs/timeline/timelinerenderer.h
index 9965458d0b9..09814d07f7a 100644
--- a/src/libs/timeline/timelinerenderer.h
+++ b/src/libs/timeline/timelinerenderer.h
@@ -35,8 +35,6 @@
 
 namespace Timeline {
 
-class TimelineRenderPass;
-class TimelineRenderState;
 
 class TIMELINE_EXPORT TimelineRenderer : public TimelineAbstractRenderer
 {

From f7924757394069d47310e6fcf2471f7bdb7a9d96 Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Wed, 20 Sep 2017 21:55:39 +0200
Subject: [PATCH 40/41] CamelHumpMatcher: Fix matching word continuations
 without hump

Let the search string "window" also find "mainwindow.cpp",
not just "MainWindow.cpp"

Task-number: QTCREATORBUG-18957
Change-Id: Iace3111fb3ce319d916362c1f8d396844a3bc47a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/libs/utils/camelhumpmatcher.cpp                        | 3 +++
 tests/auto/utils/camelhumpmatcher/tst_camelhumpmatcher.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/libs/utils/camelhumpmatcher.cpp b/src/libs/utils/camelhumpmatcher.cpp
index 0661499c7a3..cb99cff1372 100644
--- a/src/libs/utils/camelhumpmatcher.cpp
+++ b/src/libs/utils/camelhumpmatcher.cpp
@@ -73,6 +73,7 @@ QRegularExpression CamelHumpMatcher::createCamelHumpRegExp(
     const QLatin1String uppercaseWordContinuation("[a-z0-9_]*");
     const QLatin1String lowercaseWordContinuation("(?:[a-zA-Z0-9]*_)?");
     const QLatin1String upperSnakeWordContinuation("[A-Z0-9]*_");
+    keyRegExp += "(?:";
     for (const QChar &c : pattern) {
         if (!c.isLetter()) {
             if (c == question)
@@ -108,6 +109,8 @@ QRegularExpression CamelHumpMatcher::createCamelHumpRegExp(
 
         first = false;
     }
+    keyRegExp += ")|(" + QRegularExpression::escape(pattern) + ')';
+
     return QRegularExpression(keyRegExp);
 }
 
diff --git a/tests/auto/utils/camelhumpmatcher/tst_camelhumpmatcher.cpp b/tests/auto/utils/camelhumpmatcher/tst_camelhumpmatcher.cpp
index 3777c7b755f..6884ee8d7b8 100644
--- a/tests/auto/utils/camelhumpmatcher/tst_camelhumpmatcher.cpp
+++ b/tests/auto/utils/camelhumpmatcher/tst_camelhumpmatcher.cpp
@@ -77,6 +77,7 @@ void tst_CamelHumpMatcher::camelHumpMatcher_data()
     QTest::newRow("middle-after-underscore") << "CH" << "long_camel_hump" << 5;
     QTest::newRow("middle-after-underscore-uppercase") << "CH" << "LONG_CAMEL_HUMP" << 5;
     QTest::newRow("middle-continued") << "cahu" << "LongCamelHump" << 4;
+    QTest::newRow("middle-no-hump") << "window" << "mainwindow.cpp" << 4;
 }
 
 typedef QVector<int> MatchStart;
@@ -136,6 +137,8 @@ void tst_CamelHumpMatcher::highlighting_data()
                                        << MatchStart{4, 13} << MatchLength{2, 2};
     QTest::newRow("wildcard-question") << "Lo?g" << "VeryLongCamelHump"
                                        << MatchStart{4, 7} << MatchLength{2, 1};
+    QTest::newRow("middle-no-hump") << "window" << "mainwindow.cpp"
+                                    << MatchStart{4} << MatchLength{6};
 }
 
 QTEST_APPLESS_MAIN(tst_CamelHumpMatcher)

From 227acdea75a0f63e82da95dbdac2e984659a6202 Mon Sep 17 00:00:00 2001
From: Laurent Montel <laurent.montel@kdab.com>
Date: Mon, 25 Sep 2017 15:03:13 +0200
Subject: [PATCH 41/41] TextEditor: Clean forward declaration

Change-Id: If338617551893e3ce3c7a68ff1abfc60de8cf610
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/texteditor/basefilefind.h                     | 6 ------
 src/plugins/texteditor/codeassist/assistproposalitem.h    | 1 -
 .../texteditor/codeassist/assistproposaliteminterface.h   | 2 --
 src/plugins/texteditor/codeassist/codeassistant.h         | 1 -
 src/plugins/texteditor/codeassist/iassistprocessor.h      | 1 -
 src/plugins/texteditor/codeassist/iassistproposalmodel.h  | 1 -
 src/plugins/texteditor/codestyleselectorwidget.h          | 8 --------
 src/plugins/texteditor/findinfiles.h                      | 2 +-
 src/plugins/texteditor/generichighlighter/manager.h       | 1 -
 src/plugins/texteditor/icodestylepreferencesfactory.h     | 1 -
 src/plugins/texteditor/semantichighlighter.h              | 4 ----
 src/plugins/texteditor/texteditor.h                       | 2 --
 src/plugins/texteditor/texteditor_p.h                     | 2 --
 src/plugins/texteditor/texteditorsettings.h               | 1 -
 src/plugins/texteditor/textmark.h                         | 1 -
 15 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h
index 56bbb4e5fd2..d921b4f2f05 100644
--- a/src/plugins/texteditor/basefilefind.h
+++ b/src/plugins/texteditor/basefilefind.h
@@ -33,15 +33,9 @@
 
 #include <QFuture>
 
-QT_BEGIN_NAMESPACE
-class QLabel;
-class QComboBox;
-QT_END_NAMESPACE
-
 namespace Utils { class FileIterator; }
 namespace Core {
 class IEditor;
-class IFindSupport;
 class SearchResult;
 class SearchResultItem;
 } // namespace Core
diff --git a/src/plugins/texteditor/codeassist/assistproposalitem.h b/src/plugins/texteditor/codeassist/assistproposalitem.h
index 8d957a2f812..286eef67dc4 100644
--- a/src/plugins/texteditor/codeassist/assistproposalitem.h
+++ b/src/plugins/texteditor/codeassist/assistproposalitem.h
@@ -35,7 +35,6 @@
 
 namespace TextEditor {
 
-class TextEditorWidget;
 
 class TEXTEDITOR_EXPORT AssistProposalItem : public AssistProposalItemInterface
 {
diff --git a/src/plugins/texteditor/codeassist/assistproposaliteminterface.h b/src/plugins/texteditor/codeassist/assistproposaliteminterface.h
index 69bc1d91e38..a4f925f4d90 100644
--- a/src/plugins/texteditor/codeassist/assistproposaliteminterface.h
+++ b/src/plugins/texteditor/codeassist/assistproposaliteminterface.h
@@ -32,14 +32,12 @@
 QT_BEGIN_NAMESPACE
 class QIcon;
 class QString;
-class QVariant;
 QT_END_NAMESPACE
 
 #include <QString>
 
 namespace TextEditor {
 
-class TextEditorWidget;
 
 class TEXTEDITOR_EXPORT AssistProposalItemInterface
 {
diff --git a/src/plugins/texteditor/codeassist/codeassistant.h b/src/plugins/texteditor/codeassist/codeassistant.h
index 64e507f49b8..46ffa9a85c4 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.h
+++ b/src/plugins/texteditor/codeassist/codeassistant.h
@@ -34,7 +34,6 @@
 namespace TextEditor {
 
 class CodeAssistantPrivate;
-class CompletionSettings;
 class IAssistProvider;
 class TextEditorWidget;
 
diff --git a/src/plugins/texteditor/codeassist/iassistprocessor.h b/src/plugins/texteditor/codeassist/iassistprocessor.h
index d2c618ac4b2..a05c0bf8261 100644
--- a/src/plugins/texteditor/codeassist/iassistprocessor.h
+++ b/src/plugins/texteditor/codeassist/iassistprocessor.h
@@ -31,7 +31,6 @@
 
 namespace TextEditor {
 
-class IAssistProvider;
 class AssistInterface;
 class IAssistProposal;
 
diff --git a/src/plugins/texteditor/codeassist/iassistproposalmodel.h b/src/plugins/texteditor/codeassist/iassistproposalmodel.h
index 75196363934..fdb6289ce1e 100644
--- a/src/plugins/texteditor/codeassist/iassistproposalmodel.h
+++ b/src/plugins/texteditor/codeassist/iassistproposalmodel.h
@@ -31,7 +31,6 @@ QT_FORWARD_DECLARE_CLASS(QString)
 
 namespace TextEditor {
 
-class AssistProposalItem;
 
 class TEXTEDITOR_EXPORT IAssistProposalModel
 {
diff --git a/src/plugins/texteditor/codestyleselectorwidget.h b/src/plugins/texteditor/codestyleselectorwidget.h
index 05ae0c41d8a..f498ecacd7f 100644
--- a/src/plugins/texteditor/codestyleselectorwidget.h
+++ b/src/plugins/texteditor/codestyleselectorwidget.h
@@ -29,14 +29,6 @@
 
 #include <QWidget>
 
-QT_BEGIN_NAMESPACE
-class QHBoxLayout;
-class QComboBox;
-class QLabel;
-class QCheckBox;
-class QPushButton;
-QT_END_NAMESPACE
-
 namespace TextEditor {
 
 namespace Internal { namespace Ui { class CodeStyleSelectorWidget; } }
diff --git a/src/plugins/texteditor/findinfiles.h b/src/plugins/texteditor/findinfiles.h
index ab8d93bad78..f5df340ebd1 100644
--- a/src/plugins/texteditor/findinfiles.h
+++ b/src/plugins/texteditor/findinfiles.h
@@ -33,7 +33,7 @@
 #include <QStringListModel>
 
 QT_BEGIN_NAMESPACE
-class QLabel;
+class QComboBox;
 class QStackedWidget;
 QT_END_NAMESPACE
 
diff --git a/src/plugins/texteditor/generichighlighter/manager.h b/src/plugins/texteditor/generichighlighter/manager.h
index 5b602d2e039..080e649e3ad 100644
--- a/src/plugins/texteditor/generichighlighter/manager.h
+++ b/src/plugins/texteditor/generichighlighter/manager.h
@@ -38,7 +38,6 @@
 
 QT_BEGIN_NAMESPACE
 class QFileInfo;
-class QStringList;
 class QIODevice;
 template <class> class QFutureInterface;
 QT_END_NAMESPACE
diff --git a/src/plugins/texteditor/icodestylepreferencesfactory.h b/src/plugins/texteditor/icodestylepreferencesfactory.h
index 0e9b1b8d8f6..f9d534376fb 100644
--- a/src/plugins/texteditor/icodestylepreferencesfactory.h
+++ b/src/plugins/texteditor/icodestylepreferencesfactory.h
@@ -33,7 +33,6 @@ namespace Core { class Id; }
 namespace TextEditor {
 
 class ICodeStylePreferences;
-class CodeStylePool;
 class Indenter;
 class SnippetProvider;
 
diff --git a/src/plugins/texteditor/semantichighlighter.h b/src/plugins/texteditor/semantichighlighter.h
index 1ffc03d76a1..f57b037957c 100644
--- a/src/plugins/texteditor/semantichighlighter.h
+++ b/src/plugins/texteditor/semantichighlighter.h
@@ -33,10 +33,6 @@
 #include <QFuture>
 #include <QTextCharFormat>
 
-QT_BEGIN_NAMESPACE
-class QTextDocument;
-QT_END_NAMESPACE
-
 namespace TextEditor {
 
 class SyntaxHighlighter;
diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h
index b5365ad3279..b2f3d0a9fac 100644
--- a/src/plugins/texteditor/texteditor.h
+++ b/src/plugins/texteditor/texteditor.h
@@ -52,11 +52,9 @@ QT_END_NAMESPACE
 namespace TextEditor {
 class TextDocument;
 class BaseHoverHandler;
-class TabSettings;
 class RefactorOverlay;
 struct RefactorMarker;
 class SyntaxHighlighter;
-class IAssistMonitorInterface;
 class AssistInterface;
 class IAssistProvider;
 class ICodeStylePreferences;
diff --git a/src/plugins/texteditor/texteditor_p.h b/src/plugins/texteditor/texteditor_p.h
index ec2ad4ab7f8..09a9cf2a125 100644
--- a/src/plugins/texteditor/texteditor_p.h
+++ b/src/plugins/texteditor/texteditor_p.h
@@ -35,8 +35,6 @@ namespace TextEditor {
 class TextDocument;
 
 namespace Internal {
-class TextEditorOverlay;
-class ClipboardAssistProvider;
 
 class TEXTEDITOR_EXPORT TextBlockSelection
 {
diff --git a/src/plugins/texteditor/texteditorsettings.h b/src/plugins/texteditor/texteditorsettings.h
index 2c0ce20fabc..656d5856843 100644
--- a/src/plugins/texteditor/texteditorsettings.h
+++ b/src/plugins/texteditor/texteditorsettings.h
@@ -39,7 +39,6 @@ QT_END_NAMESPACE
 namespace TextEditor {
 
 class FontSettings;
-class TabSettings;
 class TypingSettings;
 class StorageSettings;
 class BehaviorSettings;
diff --git a/src/plugins/texteditor/textmark.h b/src/plugins/texteditor/textmark.h
index f8cd36b1317..d9c09ee5133 100644
--- a/src/plugins/texteditor/textmark.h
+++ b/src/plugins/texteditor/textmark.h
@@ -42,7 +42,6 @@ QT_END_NAMESPACE
 
 namespace TextEditor {
 
-class BaseTextEditor;
 class TextDocument;
 
 class TEXTEDITOR_EXPORT TextMark