Merge branch '2.7'

Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88

src/plugins/fakevim/fakevimplugin.cpp

@@ -1761,6 +1761,11 @@ void FakeVimPluginPrivate::handleExCommand(bool *handled, const ExCommand &cmd)
     if (!handler)
         return;
 
+    // Focus editor first so actions can be executed in correct context.
+    QWidget *editor = handler->widget();
+    if (editor)
+        editor->setFocus();
+
     *handled = true;
     if (cmd.matches(_("w"), _("write")) || cmd.cmd == _("wq")) {
         // :w[rite]