anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation with qt5 and c++11 combined.

Browse Source
This commit is contained in:
Guillaume Munch 2015-08-24 21:05:48 +02:00 committed by Georg Baum
parent f921c2e8ec
commit d88e401589
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/qt4/GuiApplication.cpp
View File

@ -3085,7 +3085,7 @@ bool GuiApplication::x11EventFilter(XEvent * xev)
}
#elif defined(QPA_XCB)
bool GuiApplication::nativeEventFilter(const QByteArray & eventType,
void * message, long *) Q_DECL_OVERRIDE
void * message, long *)
{
if (!current_view_ || eventType != "xcb_generic_event_t")
return false;

3
src/frontends/qt4/GuiApplication.h
View File

@ -108,7 +108,8 @@ public:
#ifdef Q_WS_X11
bool x11EventFilter(XEvent * ev);
#elif defined(QPA_XCB)
virtual bool nativeEventFilter(const QByteArray & eventType, void * message, long * result);
virtual bool nativeEventFilter(const QByteArray & eventType, void * message,
long * result) Q_DECL_OVERRIDE;
#endif
//@}