From: Pavel Sanda <sanda@lyx.org>
Date: Sun, 3 May 2009 23:33:39 +0000 (+0000)
Subject: Qt 4.5 Christmas part 2
X-Git-Tag: 2.0.0~6673
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=168ceb8763d95dab1c8f22a764e6c54956d09263;p=features.git

Qt 4.5 Christmas part 2
Now menu works smoothly in fullscreen under linux too

http://www.lyx.org/trac/ticket/4888



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29527 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index fa71523759..94ab1c98c9 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -817,8 +817,8 @@ bool GuiView::event(QEvent * e)
 
 	case QEvent::ShortcutOverride: {
 
-#ifndef Q_WS_X11
-		// FIXME bug 4888
+// See bug 4888
+#if (!defined Q_WS_X11) || (QT_VERSION >= 0x040500)
 		if (isFullScreen() && menuBar()->isHidden()) {
 			QKeyEvent * ke = static_cast<QKeyEvent*>(e);
 			// FIXME: we should also try to detect special LyX shortcut such as