Fix compilation with qt5 and c++11 combined.

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index fe3450912e5167b3c149b53c40b9e50a3004950f..7671d59650a91ba051eab38c74d0c263d69525d6 100644 (file)
--- 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 344a8620dab421e8435cf03c65b768dd777af6ce..350adc871893f885bff413caa9bd651ccaf9fd73 100644 (file)
--- 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
        //@}