Merge remote-tracking branch 'origin/4.8'

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Iaec96f929230754b87b32c2588db5cac5acd8453

src/plugins/coreplugin/documentmanager.cpp

@@ -215,7 +215,12 @@ void DocumentManagerPrivate::onApplicationFocusChange()
 
 DocumentManagerPrivate::DocumentManagerPrivate()
 {
-    connect(qApp, &QApplication::focusChanged, this, &DocumentManagerPrivate::onApplicationFocusChange);
+    // we do not want to do too much directly in the focus change event, so queue the connection
+    connect(qApp,
+            &QApplication::focusChanged,
+            this,
+            &DocumentManagerPrivate::onApplicationFocusChange,
+            Qt::QueuedConnection);
 }
 
 } // namespace Internal