Merge remote-tracking branch 'origin/2.8'

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f

src/plugins/debugger/debuggerplugin.cpp

@@ -1253,6 +1253,7 @@ public:
     QIcon m_locationMarkIcon;
 
     StatusLabel *m_statusLabel;
+    QMenu *m_viewMenu;
     QComboBox *m_threadBox;
 
     BaseWindow *m_breakWindow;