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 fa71523759012f6d3684cdf0b07642cebd3c4caa..94ab1c98c9fcb0a5d2e4032d0c3c852bb13d930d 100644 (file)
--- 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