From: Guillaume Munch <gm@lyx.org>
Date: Mon, 13 Jun 2016 06:39:04 +0000 (+0100)
Subject: ShortcutOverride again
X-Git-Tag: 2.2.1~159
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=203136d2872444ccf3ca05d1a623dd6de56676a2;p=features.git

ShortcutOverride again

Re: fix for #9218 (not #10119)

Now it matches the example given in the docs. This time tested on qt4.
---

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index a18294e5af..7cb732e01a 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -724,7 +724,7 @@ bool GuiWorkArea::event(QEvent * e)
 		return true;
 	}
 
-	case QEvent::ShortcutOverride: {
+	case QEvent::KeyPress: {
 		// We catch this event in order to catch the Tab or Shift+Tab key press
 		// which are otherwise reserved to focus switching between controls
 		// within a dialog.
@@ -733,7 +733,7 @@ bool GuiWorkArea::event(QEvent * e)
 			|| (ke->key() == Qt::Key_Backtab && (
 				ke->modifiers() == Qt::ShiftModifier
 				|| ke->modifiers() == Qt::NoModifier))) {
-			e->accept();
+			keyPressEvent(ke);
 			return true;
 		}
 		return QAbstractScrollArea::event(e);