[kdevelop] /: Merge remote-tracking branch 'origin/5.3'

[Simone Gaiarin]

Git commit 1100938098d6478b7be7d2ad0249d0ab966537f2 by Simone Gaiarin.
Committed on 25/06/2019 at 17:28.
Pushed by gaiarin into branch 'master'.

Merge remote-tracking branch 'origin/5.3'

# Conflicts:
#	plugins/contextbrowser/browsemanager.cpp

M  +2    -0    doc/kdevelop/index.docbook
M  +1    -1    plugins/contextbrowser/browsemanager.cpp

https://invent.kde.org/kde/kdevelop/commit/1100938098d6478b7be7d2ad0249d0ab966537f2

diff --cc plugins/contextbrowser/browsemanager.cpp
index a3241b3227,3afb39ce13..f71018cdd3
--- a/plugins/contextbrowser/browsemanager.cpp
+++ b/plugins/contextbrowser/browsemanager.cpp
@@@ -226,9 -209,9 +226,9 @@@ bool BrowseManager::eventFilter(QObject
          return false;
      }
  
 -    QFocusEvent* focusEvent = dynamic_cast<QFocusEvent*>(event);
 +    auto* focusEvent = dynamic_cast<QFocusEvent*>(event);
      //Eventually stop key-browsing
-     if ((keyEvent && m_browsingByKey && keyEvent->key() == m_browsingByKey && keyEvent->type() == QEvent::KeyRelease)
 -    if((keyEvent && m_browsingByKey && ( keyEvent->key() == m_browsingByKey || keyEvent->modifiers() == Qt::ControlModifier ) && keyEvent->type() == QEvent::KeyRelease)
++    if ((keyEvent && m_browsingByKey && ( keyEvent->key() == m_browsingByKey || keyEvent->modifiers() == Qt::ControlModifier ) && keyEvent->type() == QEvent::KeyRelease)
          || (focusEvent && focusEvent->lostFocus()) || event->type() == QEvent::WindowDeactivate) {
          m_browsingByKey = 0;
          emit stopDelayedBrowsing();