Merge remote-tracking branch 'origin/4.8'

Conflicts:
	src/plugins/debugger/debuggermainwindow.cpp

Change-Id: I07496916dd37b842d57ce5c49f99c079a9095a5f

src/plugins/debugger/debuggermainwindow.h

@@ -87,6 +87,7 @@ public:
     void setShouldPersistChecker(const ShouldPersistChecker &checker);
 
     QString id() const; // Currently used by GammaRay plugin.
+    QString name() const;
     QWidget *centralWidget() const;
 
     using Callback = std::function<void()>;
@@ -139,6 +140,4 @@ private:
     class DebuggerMainWindowPrivate *d = nullptr;
 };
 
-DEBUGGER_EXPORT QWidget *createModeWindow(const Core::Id &mode, QWidget *);
-
 } // Utils