Merge remote-tracking branch 'origin/4.8'

Change-Id: Ia8bf92c8effdee0e1085730cb975ff88c8ad85fc
2018-11-20 19:13:13 +02:00
parent 2e6aa7a0ed 2a65be107b
commit 5170dd0858
80 changed files with 1545 additions and 1057 deletions
--- a/src/plugins/vcsbase/vcsoutputwindow.cpp
+++ b/src/plugins/vcsbase/vcsoutputwindow.cpp
@@ -343,16 +343,17 @@ void VcsOutputWindow::visibilityChanged(bool visible)

 void VcsOutputWindow::setFocus()
 {
+    d->widget.setFocus();
 }

 bool VcsOutputWindow::hasFocus() const
 {
-    return false;
+    return d->widget.hasFocus();
 }

 bool VcsOutputWindow::canFocus() const
 {
-    return false;
+    return true;
 }

 bool VcsOutputWindow::canNavigate() const