Add missing Q_DECL_OVERRIDEs to client classes.

Change-Id: I10e550a25ce498bbeedc242ac73059cc6fdcef30
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>

24 files changed, 101 insertions, 101 deletions

diff --git a/src/client/hardwareintegration/qwaylandhardwareintegration_p.h b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h
index 466f0b20b..7ec747979 100644
--- a/src/client/hardwareintegration/qwaylandhardwareintegration_p.h
+++ b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h
@@ -63,8 +63,8 @@ public:
     QString serverBufferIntegration();
 
 protected:
-    void hardware_integration_client_backend(const QString &name);
-    void hardware_integration_server_backend(const QString &name);
+    void hardware_integration_client_backend(const QString &name) Q_DECL_OVERRIDE;
+    void hardware_integration_server_backend(const QString &name) Q_DECL_OVERRIDE;
 
 private:
     QString m_client_buffer;
diff --git a/src/client/qwaylandcursor_p.h b/src/client/qwaylandcursor_p.h
index 9e06cf626..a3461441c 100644
--- a/src/client/qwaylandcursor_p.h
+++ b/src/client/qwaylandcursor_p.h
@@ -67,10 +67,10 @@ public:
     QWaylandCursor(QWaylandScreen *screen);
     ~QWaylandCursor();
 
-    void changeCursor(QCursor *cursor, QWindow *window);
-    void pointerEvent(const QMouseEvent &event);
-    QPoint pos() const;
-    void setPos(const QPoint &pos);
+    void changeCursor(QCursor *cursor, QWindow *window) Q_DECL_OVERRIDE;
+    void pointerEvent(const QMouseEvent &event) Q_DECL_OVERRIDE;
+    QPoint pos() const Q_DECL_OVERRIDE;
+    void setPos(const QPoint &pos) Q_DECL_OVERRIDE;
 
     struct wl_cursor_image *cursorImage(Qt::CursorShape shape);
     QSharedPointer<QWaylandBuffer> cursorBitmapImage(const QCursor *cursor);
diff --git a/src/client/qwaylandinputcontext_p.h b/src/client/qwaylandinputcontext_p.h
index 679baa497..f6ade8db7 100644
--- a/src/client/qwaylandinputcontext_p.h
+++ b/src/client/qwaylandinputcontext_p.h
@@ -77,7 +77,7 @@ protected:
     void text_input_commit_string(uint32_t serial, const QString &text) Q_DECL_OVERRIDE;
     void text_input_enter(wl_surface *surface) Q_DECL_OVERRIDE;
     void text_input_leave() Q_DECL_OVERRIDE;
-    void text_input_keysym(uint32_t serial, uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers);
+    void text_input_keysym(uint32_t serial, uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers) Q_DECL_OVERRIDE;
 
 private:
     QString m_commit;
diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h
index 508b67078..1df90292b 100644
--- a/src/client/qwaylandinputdevice_p.h
+++ b/src/client/qwaylandinputdevice_p.h
@@ -222,7 +222,7 @@ public:
 
     void pointer_enter(uint32_t serial, struct wl_surface *surface,
                        wl_fixed_t sx, wl_fixed_t sy) Q_DECL_OVERRIDE;
-    void pointer_leave(uint32_t time, struct wl_surface *surface);
+    void pointer_leave(uint32_t time, struct wl_surface *surface) Q_DECL_OVERRIDE;
     void pointer_motion(uint32_t time,
                         wl_fixed_t sx, wl_fixed_t sy) Q_DECL_OVERRIDE;
     void pointer_button(uint32_t serial, uint32_t time,
diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h
index 42bc287b5..987d80599 100644
--- a/src/client/qwaylandintegration_p.h
+++ b/src/client/qwaylandintegration_p.h
@@ -66,37 +66,37 @@ public:
     QWaylandIntegration();
     ~QWaylandIntegration();
 
-    bool hasCapability(QPlatformIntegration::Capability cap) const;
-    QPlatformWindow *createPlatformWindow(QWindow *window) const;
+    bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE;
+    QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE;
 #ifndef QT_NO_OPENGL
-    QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
+    QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE;
 #endif
-    QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
+    QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE;
 
-    QAbstractEventDispatcher *createEventDispatcher() const;
-    void initialize();
+    QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE;
+    void initialize() Q_DECL_OVERRIDE;
 
-    QPlatformFontDatabase *fontDatabase() const;
+    QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE;
 
-    QPlatformNativeInterface *nativeInterface() const;
+    QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE;
 
-    QPlatformClipboard *clipboard() const;
+    QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE;
 
-    QPlatformDrag *drag() const;
+    QPlatformDrag *drag() const Q_DECL_OVERRIDE;
 
-    QPlatformInputContext *inputContext() const;
+    QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE;
 
-    QVariant styleHint(StyleHint hint) const;
+    QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE;
 
-    QPlatformAccessibility *accessibility() const;
+    QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE;
 
-    QPlatformServices *services() const;
+    QPlatformServices *services() const Q_DECL_OVERRIDE;
 
     QWaylandDisplay *display() const;
 
-    QStringList themeNames() const;
+    QStringList themeNames() const Q_DECL_OVERRIDE;
 
-    QPlatformTheme *createPlatformTheme(const QString &name) const;
+    QPlatformTheme *createPlatformTheme(const QString &name) const Q_DECL_OVERRIDE;
 
     QWaylandInputDevice *createInputDevice(QWaylandDisplay *display, int version, uint32_t id);
 
diff --git a/src/client/qwaylandnativeinterface_p.h b/src/client/qwaylandnativeinterface_p.h
index 7050f9758..b4cb8fcb4 100644
--- a/src/client/qwaylandnativeinterface_p.h
+++ b/src/client/qwaylandnativeinterface_p.h
@@ -61,17 +61,17 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandNativeInterface : public QPlatformNativeIn
 {
 public:
     QWaylandNativeInterface(QWaylandIntegration *integration);
-    void *nativeResourceForIntegration(const QByteArray &resource);
+    void *nativeResourceForIntegration(const QByteArray &resource) Q_DECL_OVERRIDE;
     void *nativeResourceForWindow(const QByteArray &resourceString,
-				  QWindow *window);
+                                  QWindow *window) Q_DECL_OVERRIDE;
     void *nativeResourceForScreen(const QByteArray &resourceString,
-                                  QScreen *screen);
-    void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context);
+                                  QScreen *screen) Q_DECL_OVERRIDE;
+    void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) Q_DECL_OVERRIDE;
 
-    QVariantMap windowProperties(QPlatformWindow *window) const;
-    QVariant windowProperty(QPlatformWindow *window, const QString &name) const;
-    QVariant windowProperty(QPlatformWindow *window, const QString &name, const QVariant &defaultValue) const;
-    void setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value);
+    QVariantMap windowProperties(QPlatformWindow *window) const Q_DECL_OVERRIDE;
+    QVariant windowProperty(QPlatformWindow *window, const QString &name) const Q_DECL_OVERRIDE;
+    QVariant windowProperty(QPlatformWindow *window, const QString &name, const QVariant &defaultValue) const Q_DECL_OVERRIDE;
+    void setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value) Q_DECL_OVERRIDE;
 
     void emitWindowPropertyChanged(QPlatformWindow *window, const QString &name);
 
diff --git a/src/client/qwaylandscreen_p.h b/src/client/qwaylandscreen_p.h
index e3e1515d4..5cc11e8c5 100644
--- a/src/client/qwaylandscreen_p.h
+++ b/src/client/qwaylandscreen_p.h
@@ -66,25 +66,25 @@ public:
     void init();
     QWaylandDisplay *display() const;
 
-    QRect geometry() const;
-    int depth() const;
-    QImage::Format format() const;
+    QRect geometry() const Q_DECL_OVERRIDE;
+    int depth() const Q_DECL_OVERRIDE;
+    QImage::Format format() const Q_DECL_OVERRIDE;
 
     QSizeF physicalSize() const Q_DECL_OVERRIDE;
 
     QDpi logicalDpi() const Q_DECL_OVERRIDE;
     QList<QPlatformScreen *> virtualSiblings() const Q_DECL_OVERRIDE;
 
-    void setOrientationUpdateMask(Qt::ScreenOrientations mask);
+    void setOrientationUpdateMask(Qt::ScreenOrientations mask) Q_DECL_OVERRIDE;
 
-    Qt::ScreenOrientation orientation() const;
+    Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE;
     int scale() const;
     qreal devicePixelRatio() const Q_DECL_OVERRIDE;
-    qreal refreshRate() const;
+    qreal refreshRate() const Q_DECL_OVERRIDE;
 
-    QString name() const { return mOutputName; }
+    QString name() const Q_DECL_OVERRIDE { return mOutputName; }
 
-    QPlatformCursor *cursor() const;
+    QPlatformCursor *cursor() const Q_DECL_OVERRIDE;
     QWaylandCursor *waylandCursor() const { return mWaylandCursor; };
 
     uint32_t outputId() const { return m_outputId; }
diff --git a/src/client/qwaylandshmbackingstore_p.h b/src/client/qwaylandshmbackingstore_p.h
index 8b58c0b5e..8ad559187 100644
--- a/src/client/qwaylandshmbackingstore_p.h
+++ b/src/client/qwaylandshmbackingstore_p.h
@@ -66,7 +66,7 @@ public:
     QWaylandShmBuffer(QWaylandDisplay *display,
            const QSize &size, QImage::Format format, int scale = 1);
     ~QWaylandShmBuffer();
-    QSize size() const { return mImage.size(); }
+    QSize size() const Q_DECL_OVERRIDE { return mImage.size(); }
     int scale() const Q_DECL_OVERRIDE { return int(mImage.devicePixelRatio()); }
     QImage *image() { return &mImage; }
 
@@ -85,11 +85,11 @@ public:
     ~QWaylandShmBackingStore();
 
     QPaintDevice *paintDevice();
-    void flush(QWindow *window, const QRegion &region, const QPoint &offset);
-    void resize(const QSize &size, const QRegion &staticContents);
+    void flush(QWindow *window, const QRegion &region, const QPoint &offset) Q_DECL_OVERRIDE;
+    void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE;
     void resize(const QSize &size);
-    void beginPaint(const QRegion &);
-    void endPaint();
+    void beginPaint(const QRegion &) Q_DECL_OVERRIDE;
+    void endPaint() Q_DECL_OVERRIDE;
     void hidden();
 
     QWaylandAbstractDecoration *windowDecoration() const;
diff --git a/src/client/qwaylandshmwindow_p.h b/src/client/qwaylandshmwindow_p.h
index a0a5edffd..ea903980d 100644
--- a/src/client/qwaylandshmwindow_p.h
+++ b/src/client/qwaylandshmwindow_p.h
@@ -58,8 +58,8 @@ public:
     QWaylandShmWindow(QWindow *window);
     ~QWaylandShmWindow();
 
-    WindowType windowType() const;
-    QSurfaceFormat format() const { return QSurfaceFormat(); }
+    WindowType windowType() const Q_DECL_OVERRIDE;
+    QSurfaceFormat format() const Q_DECL_OVERRIDE { return QSurfaceFormat(); }
 };
 
 }
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
index 6e271cc10..c60891d49 100644
--- a/src/client/qwaylandwindow_p.h
+++ b/src/client/qwaylandwindow_p.h
@@ -104,16 +104,16 @@ public:
     ~QWaylandWindow();
 
     virtual WindowType windowType() const = 0;
-    WId winId() const;
-    void setVisible(bool visible);
-    void setParent(const QPlatformWindow *parent);
+    WId winId() const Q_DECL_OVERRIDE;
+    void setVisible(bool visible) Q_DECL_OVERRIDE;
+    void setParent(const QPlatformWindow *parent) Q_DECL_OVERRIDE;
 
-    void setWindowTitle(const QString &title);
+    void setWindowTitle(const QString &title) Q_DECL_OVERRIDE;
 
     inline QIcon windowIcon() const;
-    void setWindowIcon(const QIcon &icon);
+    void setWindowIcon(const QIcon &icon) Q_DECL_OVERRIDE;
 
-    void setGeometry(const QRect &rect);
+    void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
 
     void configure(uint32_t edges, int32_t width, int32_t height);
 
@@ -127,7 +127,7 @@ public:
 
     void waitForFrameSync();
 
-    QMargins frameMargins() const;
+    QMargins frameMargins() const Q_DECL_OVERRIDE;
 
     static QWaylandWindow *fromWlSurface(::wl_surface *surface);
 
@@ -136,11 +136,11 @@ public:
     QWaylandSubSurface *subSurfaceWindow() const;
     QWaylandScreen *screen() const { return mScreen; }
 
-    void handleContentOrientationChange(Qt::ScreenOrientation orientation);
+    void handleContentOrientationChange(Qt::ScreenOrientation orientation) Q_DECL_OVERRIDE;
     void setOrientationMask(Qt::ScreenOrientations mask);
 
-    void setWindowState(Qt::WindowState state);
-    void setWindowFlags(Qt::WindowFlags flags);
+    void setWindowState(Qt::WindowState state) Q_DECL_OVERRIDE;
+    void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE;
 
     void raise() Q_DECL_OVERRIDE;
     void lower() Q_DECL_OVERRIDE;
@@ -176,7 +176,7 @@ public:
     void doResize();
     void setCanResize(bool canResize);
 
-    bool setMouseGrabEnabled(bool grab);
+    bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE;
     static QWaylandWindow *mouseGrab() { return mMouseGrab; }
 
     void sendProperty(const QString &name, const QVariant &value);
diff --git a/src/client/qwaylandwindowmanagerintegration_p.h b/src/client/qwaylandwindowmanagerintegration_p.h
index 73c1b29e8..7abad64db 100644
--- a/src/client/qwaylandwindowmanagerintegration_p.h
+++ b/src/client/qwaylandwindowmanagerintegration_p.h
@@ -71,10 +71,10 @@ public:
     explicit QWaylandWindowManagerIntegration(QWaylandDisplay *waylandDisplay);
     virtual ~QWaylandWindowManagerIntegration();
 
-    QByteArray desktopEnvironment() const;
+    QByteArray desktopEnvironment() const Q_DECL_OVERRIDE;
 
-    bool openUrl(const QUrl &url);
-    bool openDocument(const QUrl &url);
+    bool openUrl(const QUrl &url) Q_DECL_OVERRIDE;
+    bool openDocument(const QUrl &url) Q_DECL_OVERRIDE;
 
     bool showIsFullScreen() const;
 
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
index cc5940f4e..023d7acfb 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
@@ -60,13 +60,13 @@ public:
     QWaylandBrcmEglIntegration();
     ~QWaylandBrcmEglIntegration();
 
-    void initialize(QWaylandDisplay *waylandDisplay);
+    void initialize(QWaylandDisplay *waylandDisplay) Q_DECL_OVERRIDE;
 
-    bool supportsThreadedOpenGL() const { return true; }
-    bool supportsWindowDecoration() const { return false; }
+    bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE { return true; }
+    bool supportsWindowDecoration() const Q_DECL_OVERRIDE { return false; }
 
     QWaylandWindow *createEglWindow(QWindow *window);
-    QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const;
+    QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const Q_DECL_OVERRIDE;
 
     EGLDisplay eglDisplay() const;
 
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
index 4573feb76..b7cb1cf34 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
@@ -54,10 +54,10 @@ class QWaylandBrcmEglWindow : public QWaylandWindow
 public:
     QWaylandBrcmEglWindow(QWindow *window);
     ~QWaylandBrcmEglWindow();
-    WindowType windowType() const;
-    void setGeometry(const QRect &rect);
+    WindowType windowType() const Q_DECL_OVERRIDE;
+    void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
 
-    QSurfaceFormat format() const;
+    QSurfaceFormat format() const Q_DECL_OVERRIDE;
 
     bool makeCurrent(EGLContext context);
     void swapBuffers();
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
index fe86e50f2..e9c1d11f6 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
@@ -52,14 +52,14 @@ public:
     QWaylandBrcmGLContext(EGLDisplay eglDisplay, const QSurfaceFormat &format, QPlatformOpenGLContext *share);
     ~QWaylandBrcmGLContext();
 
-    void swapBuffers(QPlatformSurface *surface);
+    void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE;
 
-    bool makeCurrent(QPlatformSurface *surface);
-    void doneCurrent();
+    bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE;
+    void doneCurrent() Q_DECL_OVERRIDE;
 
-    void (*getProcAddress(const QByteArray &procName)) ();
+    void (*getProcAddress(const QByteArray &procName)) () Q_DECL_OVERRIDE;
 
-    QSurfaceFormat format() const { return m_format; }
+    QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; }
 
     EGLConfig eglConfig() const;
     EGLContext eglContext() const { return m_context; }
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
index c6bb43445..365778437 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
@@ -51,17 +51,17 @@ class QWaylandEglWindow : public QWaylandWindow
 public:
     QWaylandEglWindow(QWindow *window);
     ~QWaylandEglWindow();
-    WindowType windowType() const;
+    WindowType windowType() const Q_DECL_OVERRIDE;
 
     void updateSurface(bool create);
-    virtual void setGeometry(const QRect &rect);
+    virtual void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
     QRect contentsRect() const;
 
     EGLSurface eglSurface() const;
     GLuint contentFBO() const;
     GLuint contentTexture() const;
 
-    QSurfaceFormat format() const;
+    QSurfaceFormat format() const Q_DECL_OVERRIDE;
 
     void bindContentFBO();
 
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
index bc92c9501..f84e7c22b 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
@@ -57,19 +57,19 @@ public:
     QWaylandGLContext(EGLDisplay eglDisplay, QWaylandDisplay *display, const QSurfaceFormat &format, QPlatformOpenGLContext *share);
     ~QWaylandGLContext();
 
-    void swapBuffers(QPlatformSurface *surface);
+    void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE;
 
-    bool makeCurrent(QPlatformSurface *surface);
-    void doneCurrent();
+    bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE;
+    void doneCurrent() Q_DECL_OVERRIDE;
 
-    GLuint defaultFramebufferObject(QPlatformSurface *surface) const;
+    GLuint defaultFramebufferObject(QPlatformSurface *surface) const Q_DECL_OVERRIDE;
 
-    bool isSharing() const;
-    bool isValid() const;
+    bool isSharing() const Q_DECL_OVERRIDE;
+    bool isValid() const Q_DECL_OVERRIDE;
 
-    void (*getProcAddress(const QByteArray &procName)) ();
+    void (*getProcAddress(const QByteArray &procName)) () Q_DECL_OVERRIDE;
 
-    QSurfaceFormat format() const { return m_format; }
+    QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; }
 
     EGLConfig eglConfig() const;
     EGLContext eglContext() const { return m_context; }
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
index a9bab089d..8338601fa 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
@@ -82,8 +82,8 @@ public:
     int screen() const;
     Window rootWindow() const;
 
-    bool supportsThreadedOpenGL() const { return true; }
-    bool supportsWindowDecoration() const { return false; }
+    bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE { return true; }
+    bool supportsWindowDecoration() const Q_DECL_OVERRIDE { return false; }
 
 private:
     QWaylandDisplay *mWaylandDisplay;
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
index cbcf2b7c3..d9487b610 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
@@ -51,10 +51,10 @@ class QWaylandXCompositeEGLContext : public QEGLPlatformContext
 public:
     QWaylandXCompositeEGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, EGLConfig config);
 
-    void swapBuffers(QPlatformSurface *surface);
+    void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE;
 
 private:
-    EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface);
+    EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) Q_DECL_OVERRIDE;
 };
 
 }
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
index 489097f86..a5c07c68c 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
@@ -48,9 +48,9 @@ class QWaylandXCompositeEGLWindow : public QWaylandWindow
 {
 public:
     QWaylandXCompositeEGLWindow(QWindow *window, QWaylandXCompositeEGLClientBufferIntegration *glxIntegration);
-    WindowType windowType() const;
+    WindowType windowType() const Q_DECL_OVERRIDE;
 
-    void setGeometry(const QRect &rect);
+    void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
 
     EGLSurface eglSurface() const;
 
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
index 35078813a..fc3897aeb 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
@@ -51,14 +51,14 @@ class QWaylandXCompositeGLXContext : public QPlatformOpenGLContext
 public:
     QWaylandXCompositeGLXContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, Display *display, int screen);
 
-    QSurfaceFormat format() const;
+    QSurfaceFormat format() const Q_DECL_OVERRIDE;
 
-    void swapBuffers(QPlatformSurface *surface);
+    void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE;
 
-    bool makeCurrent(QPlatformSurface *surface);
-    void doneCurrent();
+    bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE;
+    void doneCurrent() Q_DECL_OVERRIDE;
 
-    void (*getProcAddress(const QByteArray &procName)) ();
+    void (*getProcAddress(const QByteArray &procName)) () Q_DECL_OVERRIDE;
 
 private:
     GLXContext m_context;
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
index 2a6c8ffb3..e38551fdc 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
@@ -76,8 +76,8 @@ public:
     int screen() const;
     Window rootWindow() const;
 
-    bool supportsThreadedOpenGL() const { return false; }
-    bool supportsWindowDecoration() const { return false; }
+    bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE { return false; }
+    bool supportsWindowDecoration() const Q_DECL_OVERRIDE { return false; }
 
 private:
     QWaylandDisplay *mWaylandDisplay;
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h
index e6fee1cf0..799879fea 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h
@@ -50,9 +50,9 @@ class QWaylandXCompositeGLXWindow : public QWaylandWindow
 {
 public:
     QWaylandXCompositeGLXWindow(QWindow *window, QWaylandXCompositeGLXIntegration *glxIntegration);
-    WindowType windowType() const;
+    WindowType windowType() const Q_DECL_OVERRIDE;
 
-    void setGeometry(const QRect &rect);
+    void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
 
     Window xWindow() const;
 
diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp b/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp
index e51c4bfb5..ad7eac7a6 100644
--- a/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp
+++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp
@@ -43,7 +43,7 @@ class LibHybrisEglServerBufferPlugin : public QWaylandServerBufferIntegrationPlu
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QWaylandServerBufferIntegrationFactoryInterface_iid FILE "libhybris-egl-server.json")
 public:
-    QWaylandServerBufferIntegration *create(const QString&, const QStringList&);
+    QWaylandServerBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
 };
 
 QWaylandServerBufferIntegration *LibHybrisEglServerBufferPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
index 16f0fe119..ca15407ac 100644
--- a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
+++ b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
@@ -45,7 +45,7 @@ class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-xcomposite-glx.json")
 public:
-    QPlatformIntegration *create(const QString&, const QStringList&);
+    QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
 };
 
 QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList)