commit d88e40158912e0205d2aaf21abbc9de7a6addbfc
Author: Guillaume Munch <[email protected]>
Date: Mon Aug 24 21:05:48 2015 +0200
Fix compilation with qt5 and c++11 combined.
diff --git a/src/frontends/qt4/GuiApplication.cpp
b/src/frontends/qt4/GuiApplication.cpp
index fe34509..7671d59 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -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;
diff --git a/src/frontends/qt4/GuiApplication.h
b/src/frontends/qt4/GuiApplication.h
index 344a862..350adc8 100644
--- a/src/frontends/qt4/GuiApplication.h
+++ b/src/frontends/qt4/GuiApplication.h
@@ -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
//@}