From f450acaefe7e3ca2c0bcab8243a3bbec0740ed39 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Wed, 16 Feb 2011 15:50:39 +0000 Subject: [PATCH] Menus.cpp: QProyStyle was introduced in Qt 4.6. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37692 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/Menus.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp index 4c38b7dd5d..84dc193312 100644 --- a/src/frontends/qt4/Menus.cpp +++ b/src/frontends/qt4/Menus.cpp @@ -71,7 +71,9 @@ #include #include #include +#if QT_VERSION >= 0x040600 #include +#endif #include "support/shared_ptr.h" @@ -1570,7 +1572,7 @@ void Menu::Impl::populate(QMenu & qMenu, MenuDefinition const & menu) } } -#ifdef Q_WS_WIN +#ifdef Q_WS_WIN && QT_VERSION >= 0x040600 class AlwaysMnemonicStyle : public QProxyStyle { public: int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget *widget = 0, @@ -1590,7 +1592,7 @@ public: Menu::Menu(GuiView * gv, QString const & name, bool top_level, bool keyboard) : QMenu(gv), d(new Menu::Impl) { -#ifdef Q_WS_WIN +#ifdef Q_WS_WIN && QT_VERSION >= 0x040600 if (keyboard) setStyle(new AlwaysMnemonicStyle); #else -- 2.39.2