Replace all occurrences of Q_DECL_OVERRIDE with override

Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

135 files changed, 539 insertions, 539 deletions

diff --git a/examples/wayland/custom-extension/client-common/customextension.h b/examples/wayland/custom-extension/client-common/customextension.h
index 3b64fc646..9f7fac782 100644
--- a/examples/wayland/custom-extension/client-common/customextension.h
+++ b/examples/wayland/custom-extension/client-common/customextension.h
@@ -69,11 +69,11 @@ private slots:
     void handleExtensionActive();
 
 private:
-    void example_extension_close(wl_surface *surface) Q_DECL_OVERRIDE;
-    void example_extension_set_font_size(wl_surface *surface, uint32_t pixel_size) Q_DECL_OVERRIDE;
-    void example_extension_set_window_decoration(uint32_t state) Q_DECL_OVERRIDE;
+    void example_extension_close(wl_surface *surface) override;
+    void example_extension_set_font_size(wl_surface *surface, uint32_t pixel_size) override;
+    void example_extension_set_window_decoration(uint32_t state) override;
 
-    bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *object, QEvent *event) override;
 
     QWindow *windowForSurface(struct ::wl_surface *);
     void sendWindowRegistration(QWindow *);
diff --git a/examples/wayland/custom-extension/client-common/main.cpp b/examples/wayland/custom-extension/client-common/main.cpp
index 8c27fa77d..ad7c027ff 100644
--- a/examples/wayland/custom-extension/client-common/main.cpp
+++ b/examples/wayland/custom-extension/client-common/main.cpp
@@ -54,7 +54,7 @@ class CustomIntegrationPlugin : public QPlatformIntegrationPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "client.json")
 public:
-    QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QPlatformIntegration *create(const QString&, const QStringList&) override;
 };
 
     QPlatformIntegration *CustomIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/examples/wayland/custom-extension/compositor/customextension.h b/examples/wayland/custom-extension/compositor/customextension.h
index b1b00408b..7f09ad0eb 100644
--- a/examples/wayland/custom-extension/compositor/customextension.h
+++ b/examples/wayland/custom-extension/compositor/customextension.h
@@ -54,7 +54,7 @@ class CustomExtension  : public QWaylandCompositorExtensionTemplate<CustomExtens
     Q_OBJECT
 public:
     CustomExtension(QWaylandCompositor *compositor = 0);
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
 
 signals:
     void surfaceAdded(QWaylandSurface *surface);
@@ -67,9 +67,9 @@ public slots:
     void close(QWaylandSurface *surface);
 
 protected:
-    void example_extension_bounce(Resource *resource, wl_resource *surface, uint32_t duration) Q_DECL_OVERRIDE;
-    void example_extension_spin(Resource *resource, wl_resource *surface, uint32_t duration) Q_DECL_OVERRIDE;
-    void example_extension_register_surface(Resource *resource, wl_resource *surface) Q_DECL_OVERRIDE;
+    void example_extension_bounce(Resource *resource, wl_resource *surface, uint32_t duration) override;
+    void example_extension_spin(Resource *resource, wl_resource *surface, uint32_t duration) override;
+    void example_extension_register_surface(Resource *resource, wl_resource *surface) override;
 };
 
 Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(CustomExtension)
diff --git a/examples/wayland/custom-extension/cpp-client/main.cpp b/examples/wayland/custom-extension/cpp-client/main.cpp
index af8de53b5..3dbada171 100644
--- a/examples/wayland/custom-extension/cpp-client/main.cpp
+++ b/examples/wayland/custom-extension/cpp-client/main.cpp
@@ -100,7 +100,7 @@ public slots:
     }
 
 protected:
-    void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE
+    void paintEvent(QPaintEvent *) override
     {
         QPainter p(this);
         p.setFont(m_font);
@@ -113,7 +113,7 @@ protected:
         p.drawText(rect3, Qt::TextWordWrap, "Create new window.");
     }
 
-    void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE
+    void mousePressEvent(QMouseEvent *ev) override
     {
         if (rect1.contains(ev->pos()))
             doSpin();
diff --git a/examples/wayland/minimal-cpp/compositor.h b/examples/wayland/minimal-cpp/compositor.h
index e44a8eb52..3ac0311e3 100644
--- a/examples/wayland/minimal-cpp/compositor.h
+++ b/examples/wayland/minimal-cpp/compositor.h
@@ -68,7 +68,7 @@ class Compositor : public QWaylandCompositor
 public:
     Compositor(Window *window);
     ~Compositor();
-    void create() Q_DECL_OVERRIDE;
+    void create() override;
 
     QList<View*> views() const { return m_views; }
 
diff --git a/examples/wayland/minimal-cpp/window.h b/examples/wayland/minimal-cpp/window.h
index 4df1bc833..16b14c8e9 100644
--- a/examples/wayland/minimal-cpp/window.h
+++ b/examples/wayland/minimal-cpp/window.h
@@ -55,8 +55,8 @@ public:
     void setCompositor(Compositor *comp);
 
 protected:
-    void initializeGL() Q_DECL_OVERRIDE;
-    void paintGL() Q_DECL_OVERRIDE;
+    void initializeGL() override;
+    void paintGL() override;
 
 private:
     QOpenGLTextureBlitter m_textureBlitter;
diff --git a/examples/wayland/qwindow-compositor/compositor.h b/examples/wayland/qwindow-compositor/compositor.h
index 83a76b80a..ddc85c480 100644
--- a/examples/wayland/qwindow-compositor/compositor.h
+++ b/examples/wayland/qwindow-compositor/compositor.h
@@ -118,7 +118,7 @@ class Compositor : public QWaylandCompositor
 public:
     Compositor(QWindow *window);
     ~Compositor();
-    void create() Q_DECL_OVERRIDE;
+    void create() override;
 
     void startRender();
     void endRender();
diff --git a/examples/wayland/qwindow-compositor/window.h b/examples/wayland/qwindow-compositor/window.h
index 53c85a6ef..4d8980f0c 100644
--- a/examples/wayland/qwindow-compositor/window.h
+++ b/examples/wayland/qwindow-compositor/window.h
@@ -59,15 +59,15 @@ public:
     void setCompositor(Compositor *comp);
 
 protected:
-    void initializeGL() Q_DECL_OVERRIDE;
-    void paintGL() Q_DECL_OVERRIDE;
+    void initializeGL() override;
+    void paintGL() override;
 
-    void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
-    void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
+    void mousePressEvent(QMouseEvent *e) override;
+    void mouseReleaseEvent(QMouseEvent *e) override;
+    void mouseMoveEvent(QMouseEvent *e) override;
 
-    void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
-    void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent *e) override;
+    void keyReleaseEvent(QKeyEvent *e) override;
 
 private slots:
     void startMove();
diff --git a/examples/wayland/server-buffer/client/main.cpp b/examples/wayland/server-buffer/client/main.cpp
index 1a2c447a7..bab4a942a 100644
--- a/examples/wayland/server-buffer/client/main.cpp
+++ b/examples/wayland/server-buffer/client/main.cpp
@@ -144,7 +144,7 @@ public slots:
     }
 
 protected:
-    void registry_global(uint32_t name, const QString &interface, uint32_t version) Q_DECL_OVERRIDE
+    void registry_global(uint32_t name, const QString &interface, uint32_t version) override
     {
         Q_UNUSED(version);
         if (interface == QStringLiteral("qt_share_buffer")) {
@@ -152,7 +152,7 @@ protected:
         }
     }
 
-    void share_buffer_cross_buffer(struct ::qt_server_buffer *buffer) Q_DECL_OVERRIDE
+    void share_buffer_cross_buffer(struct ::qt_server_buffer *buffer) override
     {
         QtWaylandClient::QWaylandServerBuffer *serverBuffer = m_server_buffer_integration->serverBuffer(buffer);
         if (m_server_buffer_list.isEmpty()) {
diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp
index 8c43ce5c5..9ac91244e 100644
--- a/examples/wayland/server-buffer/compositor/main.cpp
+++ b/examples/wayland/server-buffer/compositor/main.cpp
@@ -215,7 +215,7 @@ protected:
         connect(surface, &QWaylandSurface::hasContentChanged, this, &QmlCompositor::surfaceMapped);
     }
 
-    void share_buffer_bind_resource(Resource *resource) Q_DECL_OVERRIDE
+    void share_buffer_bind_resource(Resource *resource) override
     {
         if (m_server_buffer_32_bit) {
             struct ::wl_client *client = resource->handle->client;
diff --git a/src/client/global/qwaylandclientextension.h b/src/client/global/qwaylandclientextension.h
index abf753249..7e11bb47f 100644
--- a/src/client/global/qwaylandclientextension.h
+++ b/src/client/global/qwaylandclientextension.h
@@ -87,7 +87,7 @@ public:
     {
     }
 
-    const struct wl_interface *extensionInterface() const Q_DECL_OVERRIDE
+    const struct wl_interface *extensionInterface() const override
     {
         return T::interface();
     }
diff --git a/src/client/hardwareintegration/qwaylandhardwareintegration_p.h b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h
index 8b4a71629..31b4209dc 100644
--- a/src/client/hardwareintegration/qwaylandhardwareintegration_p.h
+++ b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h
@@ -69,8 +69,8 @@ public:
     QString serverBufferIntegration();
 
 protected:
-    void hardware_integration_client_backend(const QString &name) Q_DECL_OVERRIDE;
-    void hardware_integration_server_backend(const QString &name) Q_DECL_OVERRIDE;
+    void hardware_integration_client_backend(const QString &name) override;
+    void hardware_integration_server_backend(const QString &name) override;
 
 private:
     QString m_client_buffer;
diff --git a/src/client/qwaylandclipboard_p.h b/src/client/qwaylandclipboard_p.h
index 584322e07..211a96942 100644
--- a/src/client/qwaylandclipboard_p.h
+++ b/src/client/qwaylandclipboard_p.h
@@ -71,10 +71,10 @@ public:
 
     ~QWaylandClipboard();
 
-    QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE;
-    void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE;
-    bool supportsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE;
-    bool ownsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE;
+    QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override;
+    void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) override;
+    bool supportsMode(QClipboard::Mode mode) const override;
+    bool ownsMode(QClipboard::Mode mode) const override;
 
 private:
     QWaylandDisplay *mDisplay;
diff --git a/src/client/qwaylandcursor_p.h b/src/client/qwaylandcursor_p.h
index 97921f9cc..916a464e4 100644
--- a/src/client/qwaylandcursor_p.h
+++ b/src/client/qwaylandcursor_p.h
@@ -75,10 +75,10 @@ public:
     QWaylandCursor(QWaylandScreen *screen);
     ~QWaylandCursor();
 
-    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;
+    void changeCursor(QCursor *cursor, QWindow *window) override;
+    void pointerEvent(const QMouseEvent &event) override;
+    QPoint pos() const override;
+    void setPos(const QPoint &pos) override;
 
     struct wl_cursor_image *cursorImage(Qt::CursorShape shape);
     QSharedPointer<QWaylandBuffer> cursorBitmapImage(const QCursor *cursor);
diff --git a/src/client/qwaylanddatadevice_p.h b/src/client/qwaylanddatadevice_p.h
index 0b16f97d2..1ec8761b9 100644
--- a/src/client/qwaylanddatadevice_p.h
+++ b/src/client/qwaylanddatadevice_p.h
@@ -92,12 +92,12 @@ public:
     void cancelDrag();
 
 protected:
-    void data_device_data_offer(struct ::wl_data_offer *id) Q_DECL_OVERRIDE;
-    void data_device_drop() Q_DECL_OVERRIDE;
-    void data_device_enter(uint32_t serial, struct ::wl_surface *surface, wl_fixed_t x, wl_fixed_t y, struct ::wl_data_offer *id) Q_DECL_OVERRIDE;
-    void data_device_leave() Q_DECL_OVERRIDE;
-    void data_device_motion(uint32_t time, wl_fixed_t x, wl_fixed_t y) Q_DECL_OVERRIDE;
-    void data_device_selection(struct ::wl_data_offer *id) Q_DECL_OVERRIDE;
+    void data_device_data_offer(struct ::wl_data_offer *id) override;
+    void data_device_drop() override;
+    void data_device_enter(uint32_t serial, struct ::wl_surface *surface, wl_fixed_t x, wl_fixed_t y, struct ::wl_data_offer *id) override;
+    void data_device_leave() override;
+    void data_device_motion(uint32_t time, wl_fixed_t x, wl_fixed_t y) override;
+    void data_device_selection(struct ::wl_data_offer *id) override;
 
 private Q_SLOTS:
     void selectionSourceCancelled();
diff --git a/src/client/qwaylanddataoffer_p.h b/src/client/qwaylanddataoffer_p.h
index 96799c861..c7520f3e5 100644
--- a/src/client/qwaylanddataoffer_p.h
+++ b/src/client/qwaylanddataoffer_p.h
@@ -75,7 +75,7 @@ public:
     QMimeData *mimeData();
 
 protected:
-    void data_offer_offer(const QString &mime_type) Q_DECL_OVERRIDE;
+    void data_offer_offer(const QString &mime_type) override;
 
 private:
     QScopedPointer<QWaylandMimeData> m_mimeData;
@@ -90,9 +90,9 @@ public:
     void appendFormat(const QString &mimeType);
 
 protected:
-    bool hasFormat_sys(const QString &mimeType) const Q_DECL_OVERRIDE;
-    QStringList formats_sys() const Q_DECL_OVERRIDE;
-    QVariant retrieveData_sys(const QString &mimeType, QVariant::Type type) const Q_DECL_OVERRIDE;
+    bool hasFormat_sys(const QString &mimeType) const override;
+    QStringList formats_sys() const override;
+    QVariant retrieveData_sys(const QString &mimeType, QVariant::Type type) const override;
 
 private:
     int readData(int fd, QByteArray &data) const;
diff --git a/src/client/qwaylanddatasource_p.h b/src/client/qwaylanddatasource_p.h
index 540e6ad7a..0221304c8 100644
--- a/src/client/qwaylanddatasource_p.h
+++ b/src/client/qwaylanddatasource_p.h
@@ -81,9 +81,9 @@ Q_SIGNALS:
     void cancelled();
 
 protected:
-    void data_source_cancelled() Q_DECL_OVERRIDE;
-    void data_source_send(const QString &mime_type, int32_t fd) Q_DECL_OVERRIDE;
-    void data_source_target(const QString &mime_type) Q_DECL_OVERRIDE;
+    void data_source_cancelled() override;
+    void data_source_send(const QString &mime_type, int32_t fd) override;
+    void data_source_target(const QString &mime_type) override;
 
 private:
     QWaylandDisplay *m_display;
diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h
index a4631b95f..e96a89176 100644
--- a/src/client/qwaylanddisplay_p.h
+++ b/src/client/qwaylanddisplay_p.h
@@ -225,8 +225,8 @@ private:
     struct wl_callback *mSyncCallback;
     static const wl_callback_listener syncCallbackListener;
 
-    void registry_global(uint32_t id, const QString &interface, uint32_t version) Q_DECL_OVERRIDE;
-    void registry_global_remove(uint32_t id) Q_DECL_OVERRIDE;
+    void registry_global(uint32_t id, const QString &interface, uint32_t version) override;
+    void registry_global_remove(uint32_t id) override;
 
     static void shellHandleConfigure(void *data, struct wl_shell *shell,
                                      uint32_t time, uint32_t edges,
diff --git a/src/client/qwaylanddnd_p.h b/src/client/qwaylanddnd_p.h
index 215a8b74d..2a99432c5 100644
--- a/src/client/qwaylanddnd_p.h
+++ b/src/client/qwaylanddnd_p.h
@@ -71,18 +71,18 @@ public:
     QWaylandDrag(QWaylandDisplay *display);
     ~QWaylandDrag();
 
-    QMimeData *platformDropData() Q_DECL_OVERRIDE;
+    QMimeData *platformDropData() override;
 
     void updateTarget(const QString &mimeType);
     void setResponse(const QPlatformDragQtResponse &response);
     void finishDrag(const QPlatformDropQtResponse &response);
 
 protected:
-    void startDrag() Q_DECL_OVERRIDE;
-    void cancel() Q_DECL_OVERRIDE;
-    void move(const QPoint &globalPos) Q_DECL_OVERRIDE;
-    void drop(const QPoint &globalPos) Q_DECL_OVERRIDE;
-    void endDrag() Q_DECL_OVERRIDE;
+    void startDrag() override;
+    void cancel() override;
+    void move(const QPoint &globalPos) override;
+    void drop(const QPoint &globalPos) override;
+    void endDrag() override;
 
 
 private:
diff --git a/src/client/qwaylandextendedsurface_p.h b/src/client/qwaylandextendedsurface_p.h
index 39dc4fcf0..02700b290 100644
--- a/src/client/qwaylandextendedsurface_p.h
+++ b/src/client/qwaylandextendedsurface_p.h
@@ -79,9 +79,9 @@ public:
     Qt::WindowFlags setWindowFlags(Qt::WindowFlags flags);
 
 private:
-    void extended_surface_onscreen_visibility(int32_t visibility) Q_DECL_OVERRIDE;
-    void extended_surface_set_generic_property(const QString &name, wl_array *value) Q_DECL_OVERRIDE;
-    void extended_surface_close() Q_DECL_OVERRIDE;
+    void extended_surface_onscreen_visibility(int32_t visibility) override;
+    void extended_surface_set_generic_property(const QString &name, wl_array *value) override;
+    void extended_surface_close() override;
 
     QWaylandWindow *m_window;
     QVariantMap m_properties;
diff --git a/src/client/qwaylandinputcontext_p.h b/src/client/qwaylandinputcontext_p.h
index 53eab994f..a131bc5bd 100644
--- a/src/client/qwaylandinputcontext_p.h
+++ b/src/client/qwaylandinputcontext_p.h
@@ -89,20 +89,20 @@ public:
     Qt::LayoutDirection inputDirection() const;
 
 protected:
-    void zwp_text_input_v2_enter(uint32_t serial, struct ::wl_surface *surface) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_leave(uint32_t serial, struct ::wl_surface *surface) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_modifiers_map(wl_array *map) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_input_panel_state(uint32_t state, int32_t x, int32_t y, int32_t width, int32_t height) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_preedit_string(const QString &text, const QString &commit) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_preedit_styling(uint32_t index, uint32_t length, uint32_t style) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_preedit_cursor(int32_t index) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_commit_string(const QString &text) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_cursor_position(int32_t index, int32_t anchor) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_delete_surrounding_text(uint32_t before_length, uint32_t after_length) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_keysym(uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_language(const QString &language) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_text_direction(uint32_t direction) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_input_method_changed(uint32_t serial, uint32_t flags) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_enter(uint32_t serial, struct ::wl_surface *surface) override;
+    void zwp_text_input_v2_leave(uint32_t serial, struct ::wl_surface *surface) override;
+    void zwp_text_input_v2_modifiers_map(wl_array *map) override;
+    void zwp_text_input_v2_input_panel_state(uint32_t state, int32_t x, int32_t y, int32_t width, int32_t height) override;
+    void zwp_text_input_v2_preedit_string(const QString &text, const QString &commit) override;
+    void zwp_text_input_v2_preedit_styling(uint32_t index, uint32_t length, uint32_t style) override;
+    void zwp_text_input_v2_preedit_cursor(int32_t index) override;
+    void zwp_text_input_v2_commit_string(const QString &text) override;
+    void zwp_text_input_v2_cursor_position(int32_t index, int32_t anchor) override;
+    void zwp_text_input_v2_delete_surrounding_text(uint32_t before_length, uint32_t after_length) override;
+    void zwp_text_input_v2_keysym(uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers) override;
+    void zwp_text_input_v2_language(const QString &language) override;
+    void zwp_text_input_v2_text_direction(uint32_t direction) override;
+    void zwp_text_input_v2_input_method_changed(uint32_t serial, uint32_t flags) override;
 
 private:
     Qt::KeyboardModifiers modifiersToQtModifiers(uint32_t modifiers);
@@ -134,23 +134,23 @@ public:
     explicit QWaylandInputContext(QWaylandDisplay *display);
     ~QWaylandInputContext();
 
-    bool isValid() const Q_DECL_OVERRIDE;
+    bool isValid() const override;
 
-    void reset() Q_DECL_OVERRIDE;
-    void commit() Q_DECL_OVERRIDE;
-    void update(Qt::InputMethodQueries) Q_DECL_OVERRIDE;
+    void reset() override;
+    void commit() override;
+    void update(Qt::InputMethodQueries) override;
 
-    void invokeAction(QInputMethod::Action, int cursorPosition) Q_DECL_OVERRIDE;
+    void invokeAction(QInputMethod::Action, int cursorPosition) override;
 
-    void showInputPanel() Q_DECL_OVERRIDE;
-    void hideInputPanel() Q_DECL_OVERRIDE;
-    bool isInputPanelVisible() const Q_DECL_OVERRIDE;
-    QRectF keyboardRect() const Q_DECL_OVERRIDE;
+    void showInputPanel() override;
+    void hideInputPanel() override;
+    bool isInputPanelVisible() const override;
+    QRectF keyboardRect() const override;
 
-    QLocale locale() const Q_DECL_OVERRIDE;
-    Qt::LayoutDirection inputDirection() const Q_DECL_OVERRIDE;
+    QLocale locale() const override;
+    Qt::LayoutDirection inputDirection() const override;
 
-    void setFocusObject(QObject *object) Q_DECL_OVERRIDE;
+    void setFocusObject(QObject *object) override;
 
 private:
     QWaylandTextInput *textInput() const;
diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h
index f2bbd0dc0..d8bd0062f 100644
--- a/src/client/qwaylandinputdevice_p.h
+++ b/src/client/qwaylandinputdevice_p.h
@@ -154,7 +154,7 @@ private:
     uint32_t mTime;
     uint32_t mSerial;
 
-    void seat_capabilities(uint32_t caps) Q_DECL_OVERRIDE;
+    void seat_capabilities(uint32_t caps) override;
     void handleTouchPoint(int id, double x, double y, Qt::TouchPointState state);
 
     QTouchDevice *mTouchDevice;
@@ -183,19 +183,19 @@ public:
 
     void keyboard_keymap(uint32_t format,
                          int32_t fd,
-                         uint32_t size) Q_DECL_OVERRIDE;
+                         uint32_t size) override;
     void keyboard_enter(uint32_t time,
                         struct wl_surface *surface,
-                        struct wl_array *keys) Q_DECL_OVERRIDE;
+                        struct wl_array *keys) override;
     void keyboard_leave(uint32_t time,
-                        struct wl_surface *surface) Q_DECL_OVERRIDE;
+                        struct wl_surface *surface) override;
     void keyboard_key(uint32_t serial, uint32_t time,
-                      uint32_t key, uint32_t state) Q_DECL_OVERRIDE;
+                      uint32_t key, uint32_t state) override;
     void keyboard_modifiers(uint32_t serial,
                             uint32_t mods_depressed,
                             uint32_t mods_latched,
                             uint32_t mods_locked,
-                            uint32_t group) Q_DECL_OVERRIDE;
+                            uint32_t group) override;
 
     QWaylandInputDevice *mParent;
     QWaylandWindow *mFocus;
@@ -236,15 +236,15 @@ public:
     virtual ~Pointer();
 
     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) Q_DECL_OVERRIDE;
+                       wl_fixed_t sx, wl_fixed_t sy) override;
+    void pointer_leave(uint32_t time, struct wl_surface *surface) override;
     void pointer_motion(uint32_t time,
-                        wl_fixed_t sx, wl_fixed_t sy) Q_DECL_OVERRIDE;
+                        wl_fixed_t sx, wl_fixed_t sy) override;
     void pointer_button(uint32_t serial, uint32_t time,
-                        uint32_t button, uint32_t state) Q_DECL_OVERRIDE;
+                        uint32_t button, uint32_t state) override;
     void pointer_axis(uint32_t time,
                       uint32_t axis,
-                      wl_fixed_t value) Q_DECL_OVERRIDE;
+                      wl_fixed_t value) override;
 
     void releaseButtons();
 
@@ -274,16 +274,16 @@ public:
                     struct wl_surface *surface,
                     int32_t id,
                     wl_fixed_t x,
-                    wl_fixed_t y) Q_DECL_OVERRIDE;
+                    wl_fixed_t y) override;
     void touch_up(uint32_t serial,
                   uint32_t time,
-                  int32_t id) Q_DECL_OVERRIDE;
+                  int32_t id) override;
     void touch_motion(uint32_t time,
                       int32_t id,
                       wl_fixed_t x,
-                      wl_fixed_t y) Q_DECL_OVERRIDE;
-    void touch_frame() Q_DECL_OVERRIDE;
-    void touch_cancel() Q_DECL_OVERRIDE;
+                      wl_fixed_t y) override;
+    void touch_frame() override;
+    void touch_cancel() override;
 
     bool allTouchPointsReleased();
     void releasePoints();
diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h
index 90fce4fcf..174eca253 100644
--- a/src/client/qwaylandintegration_p.h
+++ b/src/client/qwaylandintegration_p.h
@@ -73,40 +73,40 @@ public:
     QWaylandIntegration();
     ~QWaylandIntegration();
 
-    bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE;
-    QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE;
+    bool hasCapability(QPlatformIntegration::Capability cap) const override;
+    QPlatformWindow *createPlatformWindow(QWindow *window) const override;
 #if QT_CONFIG(opengl)
-    QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE;
+    QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override;
 #endif
-    QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE;
+    QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override;
 
-    QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE;
-    void initialize() Q_DECL_OVERRIDE;
+    QAbstractEventDispatcher *createEventDispatcher() const override;
+    void initialize() override;
 
-    QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE;
+    QPlatformFontDatabase *fontDatabase() const override;
 
-    QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE;
+    QPlatformNativeInterface *nativeInterface() const override;
 #if QT_CONFIG(clipboard)
-    QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE;
+    QPlatformClipboard *clipboard() const override;
 #endif
 #if QT_CONFIG(draganddrop)
-    QPlatformDrag *drag() const Q_DECL_OVERRIDE;
+    QPlatformDrag *drag() const override;
 #endif
-    QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE;
+    QPlatformInputContext *inputContext() const override;
 
-    QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE;
+    QVariant styleHint(StyleHint hint) const override;
 
 #if QT_CONFIG(accessibility)
-    QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE;
+    QPlatformAccessibility *accessibility() const override;
 #endif
 
-    QPlatformServices *services() const Q_DECL_OVERRIDE;
+    QPlatformServices *services() const override;
 
     QWaylandDisplay *display() const;
 
-    QStringList themeNames() const Q_DECL_OVERRIDE;
+    QStringList themeNames() const override;
 
-    QPlatformTheme *createPlatformTheme(const QString &name) const Q_DECL_OVERRIDE;
+    QPlatformTheme *createPlatformTheme(const QString &name) const 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 7b8b28342..c83180c09 100644
--- a/src/client/qwaylandnativeinterface_p.h
+++ b/src/client/qwaylandnativeinterface_p.h
@@ -67,22 +67,22 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandNativeInterface : public QPlatformNativeIn
 {
 public:
     QWaylandNativeInterface(QWaylandIntegration *integration);
-    void *nativeResourceForIntegration(const QByteArray &resource) Q_DECL_OVERRIDE;
+    void *nativeResourceForIntegration(const QByteArray &resource) override;
     void *nativeResourceForWindow(const QByteArray &resourceString,
-                                  QWindow *window) Q_DECL_OVERRIDE;
+                                  QWindow *window) override;
     void *nativeResourceForScreen(const QByteArray &resourceString,
-                                  QScreen *screen) Q_DECL_OVERRIDE;
+                                  QScreen *screen) override;
 #if QT_CONFIG(opengl)
-    void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) Q_DECL_OVERRIDE;
+    void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) override;
 #endif
-    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;
+    QVariantMap windowProperties(QPlatformWindow *window) const override;
+    QVariant windowProperty(QPlatformWindow *window, const QString &name) const override;
+    QVariant windowProperty(QPlatformWindow *window, const QString &name, const QVariant &defaultValue) const override;
+    void setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value) override;
 
     void emitWindowPropertyChanged(QPlatformWindow *window, const QString &name);
 
-    QFunctionPointer platformFunction(const QByteArray &resource) const Q_DECL_OVERRIDE;
+    QFunctionPointer platformFunction(const QByteArray &resource) const override;
 
 private:
     QWaylandIntegration *m_integration;
diff --git a/src/client/qwaylandqtkey_p.h b/src/client/qwaylandqtkey_p.h
index 155b62540..3374b907a 100644
--- a/src/client/qwaylandqtkey_p.h
+++ b/src/client/qwaylandqtkey_p.h
@@ -80,7 +80,7 @@ private:
                              uint32_t nativeModifiers,
                              const QString &text,
                              uint32_t autorep,
-                             uint32_t count) Q_DECL_OVERRIDE;
+                             uint32_t count) override;
 
 };
 
diff --git a/src/client/qwaylandscreen_p.h b/src/client/qwaylandscreen_p.h
index f9f0776ff..b2900a964 100644
--- a/src/client/qwaylandscreen_p.h
+++ b/src/client/qwaylandscreen_p.h
@@ -72,26 +72,26 @@ public:
     void init();
     QWaylandDisplay *display() const;
 
-    QRect geometry() const Q_DECL_OVERRIDE;
-    int depth() const Q_DECL_OVERRIDE;
-    QImage::Format format() const Q_DECL_OVERRIDE;
+    QRect geometry() const override;
+    int depth() const override;
+    QImage::Format format() const override;
 
-    QSizeF physicalSize() const Q_DECL_OVERRIDE;
+    QSizeF physicalSize() const override;
 
-    QDpi logicalDpi() const Q_DECL_OVERRIDE;
-    QList<QPlatformScreen *> virtualSiblings() const Q_DECL_OVERRIDE;
+    QDpi logicalDpi() const override;
+    QList<QPlatformScreen *> virtualSiblings() const override;
 
-    void setOrientationUpdateMask(Qt::ScreenOrientations mask) Q_DECL_OVERRIDE;
+    void setOrientationUpdateMask(Qt::ScreenOrientations mask) override;
 
-    Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE;
+    Qt::ScreenOrientation orientation() const override;
     int scale() const;
-    qreal devicePixelRatio() const Q_DECL_OVERRIDE;
-    qreal refreshRate() const Q_DECL_OVERRIDE;
+    qreal devicePixelRatio() const override;
+    qreal refreshRate() const override;
 
-    QString name() const Q_DECL_OVERRIDE { return mOutputName; }
+    QString name() const override { return mOutputName; }
 
 #if QT_CONFIG(cursor)
-    QPlatformCursor *cursor() const Q_DECL_OVERRIDE;
+    QPlatformCursor *cursor() const override;
     QWaylandCursor *waylandCursor() const { return mWaylandCursor; };
 #endif
 
@@ -101,15 +101,15 @@ public:
     static QWaylandScreen *waylandScreenFromWindow(QWindow *window);
 
 private:
-    void output_mode(uint32_t flags, int width, int height, int refresh) Q_DECL_OVERRIDE;
+    void output_mode(uint32_t flags, int width, int height, int refresh) override;
     void output_geometry(int32_t x, int32_t y,
                          int32_t width, int32_t height,
                          int subpixel,
                          const QString &make,
                          const QString &model,
-                         int32_t transform) Q_DECL_OVERRIDE;
-    void output_scale(int32_t factor) Q_DECL_OVERRIDE;
-    void output_done() Q_DECL_OVERRIDE;
+                         int32_t transform) override;
+    void output_scale(int32_t factor) override;
+    void output_done() override;
 
     int m_outputId;
     QWaylandDisplay *mWaylandDisplay;
diff --git a/src/client/qwaylandshmbackingstore_p.h b/src/client/qwaylandshmbackingstore_p.h
index a5b809c76..71f98e30c 100644
--- a/src/client/qwaylandshmbackingstore_p.h
+++ b/src/client/qwaylandshmbackingstore_p.h
@@ -72,8 +72,8 @@ public:
     QWaylandShmBuffer(QWaylandDisplay *display,
            const QSize &size, QImage::Format format, int scale = 1);
     ~QWaylandShmBuffer();
-    QSize size() const Q_DECL_OVERRIDE { return mImage.size(); }
-    int scale() const Q_DECL_OVERRIDE { return int(mImage.devicePixelRatio()); }
+    QSize size() const override { return mImage.size(); }
+    int scale() const override { return int(mImage.devicePixelRatio()); }
     QImage *image() { return &mImage; }
 
     QImage *imageInsideMargins(const QMargins &margins);
@@ -91,11 +91,11 @@ public:
     ~QWaylandShmBackingStore();
 
     QPaintDevice *paintDevice();
-    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 flush(QWindow *window, const QRegion &region, const QPoint &offset) override;
+    void resize(const QSize &size, const QRegion &staticContents) override;
     void resize(const QSize &size);
-    void beginPaint(const QRegion &) Q_DECL_OVERRIDE;
-    void endPaint() Q_DECL_OVERRIDE;
+    void beginPaint(const QRegion &) override;
+    void endPaint() override;
 
     QWaylandAbstractDecoration *windowDecoration() const;
 
@@ -108,7 +108,7 @@ public:
     void iterateBuffer();
 
 #if QT_CONFIG(opengl)
-    QImage toImage() const Q_DECL_OVERRIDE;
+    QImage toImage() const override;
 #endif
 
 private:
diff --git a/src/client/qwaylandshmwindow_p.h b/src/client/qwaylandshmwindow_p.h
index d06b9b009..af86ce3a3 100644
--- a/src/client/qwaylandshmwindow_p.h
+++ b/src/client/qwaylandshmwindow_p.h
@@ -64,8 +64,8 @@ public:
     QWaylandShmWindow(QWindow *window);
     ~QWaylandShmWindow();
 
-    WindowType windowType() const Q_DECL_OVERRIDE;
-    QSurfaceFormat format() const Q_DECL_OVERRIDE { return QSurfaceFormat(); }
+    WindowType windowType() const override;
+    QSurfaceFormat format() const override { return QSurfaceFormat(); }
 };
 
 }
diff --git a/src/client/qwaylandtouch_p.h b/src/client/qwaylandtouch_p.h
index b17bce6ab..7d909769d 100644
--- a/src/client/qwaylandtouch_p.h
+++ b/src/client/qwaylandtouch_p.h
@@ -88,8 +88,8 @@ private:
                                int32_t velocity_x,
                                int32_t velocity_y,
                                uint32_t flags,
-                               struct wl_array *rawdata) Q_DECL_OVERRIDE;
-    void touch_extension_configure(uint32_t flags) Q_DECL_OVERRIDE;
+                               struct wl_array *rawdata) override;
+    void touch_extension_configure(uint32_t flags) override;
 
     void sendTouchEvent();
 
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
index 7b48e890f..d5d6e3a31 100644
--- a/src/client/qwaylandwindow_p.h
+++ b/src/client/qwaylandwindow_p.h
@@ -111,16 +111,16 @@ public:
     ~QWaylandWindow();
 
     virtual WindowType windowType() const = 0;
-    WId winId() const Q_DECL_OVERRIDE;
-    void setVisible(bool visible) Q_DECL_OVERRIDE;
-    void setParent(const QPlatformWindow *parent) Q_DECL_OVERRIDE;
+    WId winId() const override;
+    void setVisible(bool visible) override;
+    void setParent(const QPlatformWindow *parent) override;
 
-    void setWindowTitle(const QString &title) Q_DECL_OVERRIDE;
+    void setWindowTitle(const QString &title) override;
 
     inline QIcon windowIcon() const;
-    void setWindowIcon(const QIcon &icon) Q_DECL_OVERRIDE;
+    void setWindowIcon(const QIcon &icon) override;
 
-    void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
+    void setGeometry(const QRect &rect) override;
 
     void configure(uint32_t edges, int32_t width, int32_t height);
 
@@ -136,7 +136,7 @@ public:
 
     void waitForFrameSync();
 
-    QMargins frameMargins() const Q_DECL_OVERRIDE;
+    QMargins frameMargins() const override;
 
     static QWaylandWindow *fromWlSurface(::wl_surface *surface);
 
@@ -145,22 +145,22 @@ public:
     QWaylandSubSurface *subSurfaceWindow() const;
     QWaylandScreen *screen() const { return mScreen; }
 
-    void handleContentOrientationChange(Qt::ScreenOrientation orientation) Q_DECL_OVERRIDE;
+    void handleContentOrientationChange(Qt::ScreenOrientation orientation) override;
     void setOrientationMask(Qt::ScreenOrientations mask);
 
-    void setWindowState(Qt::WindowState state) Q_DECL_OVERRIDE;
-    void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE;
+    void setWindowState(Qt::WindowState state) override;
+    void setWindowFlags(Qt::WindowFlags flags) override;
 
-    void raise() Q_DECL_OVERRIDE;
-    void lower() Q_DECL_OVERRIDE;
+    void raise() override;
+    void lower() override;
 
-    void setMask(const QRegion &region) Q_DECL_OVERRIDE;
+    void setMask(const QRegion &region) override;
 
     int scale() const;
-    qreal devicePixelRatio() const Q_DECL_OVERRIDE;
+    qreal devicePixelRatio() const override;
 
-    void requestActivateWindow() Q_DECL_OVERRIDE;
-    bool isExposed() const Q_DECL_OVERRIDE;
+    void requestActivateWindow() override;
+    bool isExposed() const override;
     void unfocus();
 
     QWaylandAbstractDecoration *decoration() const;
@@ -187,7 +187,7 @@ public:
     void doResize();
     void setCanResize(bool canResize);
 
-    bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE;
+    bool setMouseGrabEnabled(bool grab) override;
     static QWaylandWindow *mouseGrab() { return mMouseGrab; }
 
     void sendProperty(const QString &name, const QVariant &value);
@@ -200,11 +200,11 @@ public:
     void setBackingStore(QWaylandShmBackingStore *backingStore) { mBackingStore = backingStore; }
     QWaylandShmBackingStore *backingStore() const { return mBackingStore; }
 
-    bool setKeyboardGrabEnabled(bool) Q_DECL_OVERRIDE { return false; }
-    void propagateSizeHints() Q_DECL_OVERRIDE { }
+    bool setKeyboardGrabEnabled(bool) override { return false; }
+    void propagateSizeHints() override { }
     void addAttachOffset(const QPoint point);
 
-    void requestUpdate() Q_DECL_OVERRIDE;
+    void requestUpdate() override;
 
 public slots:
     void requestResize();
diff --git a/src/client/qwaylandwindowmanagerintegration_p.h b/src/client/qwaylandwindowmanagerintegration_p.h
index 463b67ef6..cf6ca6605 100644
--- a/src/client/qwaylandwindowmanagerintegration_p.h
+++ b/src/client/qwaylandwindowmanagerintegration_p.h
@@ -77,10 +77,10 @@ public:
     explicit QWaylandWindowManagerIntegration(QWaylandDisplay *waylandDisplay);
     virtual ~QWaylandWindowManagerIntegration();
 
-    QByteArray desktopEnvironment() const Q_DECL_OVERRIDE;
+    QByteArray desktopEnvironment() const override;
 
-    bool openUrl(const QUrl &url) Q_DECL_OVERRIDE;
-    bool openDocument(const QUrl &url) Q_DECL_OVERRIDE;
+    bool openUrl(const QUrl &url) override;
+    bool openDocument(const QUrl &url) override;
 
     bool showIsFullScreen() const;
 
@@ -90,8 +90,8 @@ private:
 
     QScopedPointer<QWaylandWindowManagerIntegrationPrivate> d_ptr;
 
-    void windowmanager_hints(int32_t showIsFullScreen) Q_DECL_OVERRIDE;
-    void windowmanager_quit() Q_DECL_OVERRIDE;
+    void windowmanager_hints(int32_t showIsFullScreen) override;
+    void windowmanager_quit() override;
 
     void openUrl_helper(const QUrl &url);
 };
diff --git a/src/client/qwaylandwlshellintegration_p.h b/src/client/qwaylandwlshellintegration_p.h
index 9082c7628..55b8f89ca 100644
--- a/src/client/qwaylandwlshellintegration_p.h
+++ b/src/client/qwaylandwlshellintegration_p.h
@@ -58,8 +58,8 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandWlShellIntegration : public QWaylandShellI
 {
 public:
     QWaylandWlShellIntegration(QWaylandDisplay* display);
-    bool initialize(QWaylandDisplay *) Q_DECL_OVERRIDE;
-    QWaylandShellSurface *createShellSurface(QWaylandWindow *window) Q_DECL_OVERRIDE;
+    bool initialize(QWaylandDisplay *) override;
+    QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override;
 
 private:
     QtWayland::wl_shell *m_wlShell;
diff --git a/src/client/qwaylandwlshellsurface_p.h b/src/client/qwaylandwlshellsurface_p.h
index 89bce5585..94e3417a4 100644
--- a/src/client/qwaylandwlshellsurface_p.h
+++ b/src/client/qwaylandwlshellsurface_p.h
@@ -78,27 +78,27 @@ public:
     virtual ~QWaylandWlShellSurface();
 
     using QtWayland::wl_shell_surface::resize;
-    void resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges) Q_DECL_OVERRIDE;
+    void resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges) override;
 
     using QtWayland::wl_shell_surface::move;
-    void move(QWaylandInputDevice *inputDevice) Q_DECL_OVERRIDE;
+    void move(QWaylandInputDevice *inputDevice) override;
 
-    void setTitle(const QString & title) Q_DECL_OVERRIDE;
-    void setAppId(const QString &appId) Q_DECL_OVERRIDE;
+    void setTitle(const QString & title) override;
+    void setAppId(const QString &appId) override;
 
-    void raise() Q_DECL_OVERRIDE;
-    void lower() Q_DECL_OVERRIDE;
-    void setContentOrientationMask(Qt::ScreenOrientations orientation) Q_DECL_OVERRIDE;
-    void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE;
-    void sendProperty(const QString &name, const QVariant &value) Q_DECL_OVERRIDE;
+    void raise() override;
+    void lower() override;
+    void setContentOrientationMask(Qt::ScreenOrientations orientation) override;
+    void setWindowFlags(Qt::WindowFlags flags) override;
+    void sendProperty(const QString &name, const QVariant &value) override;
 
     void setType(Qt::WindowType type, QWaylandWindow *transientParent) override;
 
 private:
-    void setMaximized() Q_DECL_OVERRIDE;
-    void setFullscreen() Q_DECL_OVERRIDE;
-    void setNormal() Q_DECL_OVERRIDE;
-    void setMinimized() Q_DECL_OVERRIDE;
+    void setMaximized() override;
+    void setFullscreen() override;
+    void setNormal() override;
+    void setMinimized() override;
 
     void setTopLevel();
     void updateTransientParent(QWindow *parent);
@@ -110,11 +110,11 @@ private:
     QSize m_size;
     QWaylandExtendedSurface *m_extendedWindow;
 
-    void shell_surface_ping(uint32_t serial) Q_DECL_OVERRIDE;
+    void shell_surface_ping(uint32_t serial) override;
     void shell_surface_configure(uint32_t edges,
                                  int32_t width,
-                                 int32_t height) Q_DECL_OVERRIDE;
-    void shell_surface_popup_done() Q_DECL_OVERRIDE;
+                                 int32_t height) override;
+    void shell_surface_popup_done() override;
 
     friend class QWaylandWindow;
 };
diff --git a/src/client/qwaylandxdgshell_p.h b/src/client/qwaylandxdgshell_p.h
index 97a15e46a..f462f2828 100644
--- a/src/client/qwaylandxdgshell_p.h
+++ b/src/client/qwaylandxdgshell_p.h
@@ -82,7 +82,7 @@ public:
     QWaylandXdgPopup *createXdgPopup(QWaylandWindow *window);
 
 private:
-    void xdg_shell_ping(uint32_t serial) Q_DECL_OVERRIDE;
+    void xdg_shell_ping(uint32_t serial) override;
 
     QVector<QWaylandWindow *> m_popups;
     uint m_popupSerial;
diff --git a/src/client/qwaylandxdgshellintegration_p.h b/src/client/qwaylandxdgshellintegration_p.h
index e0e6bda0d..e14bf5bd2 100644
--- a/src/client/qwaylandxdgshellintegration_p.h
+++ b/src/client/qwaylandxdgshellintegration_p.h
@@ -59,9 +59,9 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgShellIntegration : public QWaylandShell
 {
 public:
     QWaylandXdgShellIntegration(QWaylandDisplay *display);
-    bool initialize(QWaylandDisplay *display) Q_DECL_OVERRIDE;
-    QWaylandShellSurface *createShellSurface(QWaylandWindow *window) Q_DECL_OVERRIDE;
-    void handleKeyboardFocusChanged(QWaylandWindow *newFocus, QWaylandWindow *oldFocus) Q_DECL_OVERRIDE;
+    bool initialize(QWaylandDisplay *display) override;
+    QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override;
+    void handleKeyboardFocusChanged(QWaylandWindow *newFocus, QWaylandWindow *oldFocus) override;
 
 private:
     QWaylandXdgShell *m_xdgShell;
diff --git a/src/client/qwaylandxdgsurface_p.h b/src/client/qwaylandxdgsurface_p.h
index 184ef13eb..00154ade0 100644
--- a/src/client/qwaylandxdgsurface_p.h
+++ b/src/client/qwaylandxdgsurface_p.h
@@ -82,19 +82,19 @@ public:
     using QtWayland::xdg_surface::resize;
     void resize(QWaylandInputDevice *inputDevice, enum resize_edge edges);
 
-    void resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges) Q_DECL_OVERRIDE;
+    void resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges) override;
 
     using QtWayland::xdg_surface::move;
-    void move(QWaylandInputDevice *inputDevice) Q_DECL_OVERRIDE;
+    void move(QWaylandInputDevice *inputDevice) override;
 
-    void setTitle(const QString &title) Q_DECL_OVERRIDE;
-    void setAppId(const QString &appId) Q_DECL_OVERRIDE;
+    void setTitle(const QString &title) override;
+    void setAppId(const QString &appId) override;
 
-    void raise() Q_DECL_OVERRIDE;
-    void lower() Q_DECL_OVERRIDE;
-    void setContentOrientationMask(Qt::ScreenOrientations orientation) Q_DECL_OVERRIDE;
-    void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE;
-    void sendProperty(const QString &name, const QVariant &value) Q_DECL_OVERRIDE;
+    void raise() override;
+    void lower() override;
+    void setContentOrientationMask(Qt::ScreenOrientations orientation) override;
+    void setWindowFlags(Qt::WindowFlags flags) override;
+    void sendProperty(const QString &name, const QVariant &value) override;
 
     bool isFullscreen() const { return m_fullscreen; }
     bool isMaximized() const { return m_maximized; }
@@ -102,10 +102,10 @@ public:
     void setType(Qt::WindowType type, QWaylandWindow *transientParent) override;
 
 private:
-    void setMaximized() Q_DECL_OVERRIDE;
-    void setFullscreen() Q_DECL_OVERRIDE;
-    void setNormal() Q_DECL_OVERRIDE;
-    void setMinimized() Q_DECL_OVERRIDE;
+    void setMaximized() override;
+    void setFullscreen() override;
+    void setNormal() override;
+    void setMinimized() override;
 
     void updateTransientParent(QWaylandWindow *parent);
 
@@ -123,8 +123,8 @@ private:
     void xdg_surface_configure(int32_t width,
                                int32_t height,
                                struct wl_array *states,
-                               uint32_t serial) Q_DECL_OVERRIDE;
-    void xdg_surface_close() Q_DECL_OVERRIDE;
+                               uint32_t serial) override;
+    void xdg_surface_close() override;
 
     friend class QWaylandWindow;
 };
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index 29397f64f..499d81b3f 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -99,7 +99,7 @@ class WindowSystemEventHandler : public QWindowSystemEventHandler
 {
 public:
     WindowSystemEventHandler(QWaylandCompositor *c) : compositor(c) {}
-    bool sendEvent(QWindowSystemInterfacePrivate::WindowSystemEvent *e) Q_DECL_OVERRIDE
+    bool sendEvent(QWindowSystemInterfacePrivate::WindowSystemEvent *e) override
     {
         if (e->type == QWindowSystemInterfacePrivate::Key) {
             QWindowSystemInterfacePrivate::KeyEvent *ke = static_cast<QWindowSystemInterfacePrivate::KeyEvent *>(e);
diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h
index e59fdcbb5..f85fd8cc5 100644
--- a/src/compositor/compositor_api/qwaylandcompositor_p.h
+++ b/src/compositor/compositor_api/qwaylandcompositor_p.h
@@ -108,10 +108,10 @@ public:
     inline void addOutput(QWaylandOutput *output);
     inline void removeOutput(QWaylandOutput *output);
 protected:
-    void compositor_create_surface(wl_compositor::Resource *resource, uint32_t id) Q_DECL_OVERRIDE;
-    void compositor_create_region(wl_compositor::Resource *resource, uint32_t id) Q_DECL_OVERRIDE;
+    void compositor_create_surface(wl_compositor::Resource *resource, uint32_t id) override;
+    void compositor_create_region(wl_compositor::Resource *resource, uint32_t id) override;
 
-    void subcompositor_get_subsurface(wl_subcompositor::Resource *resource, uint32_t id, struct ::wl_resource *surface, struct ::wl_resource *parent) Q_DECL_OVERRIDE;
+    void subcompositor_get_subsurface(wl_subcompositor::Resource *resource, uint32_t id, struct ::wl_resource *surface, struct ::wl_resource *parent) override;
 
     virtual QWaylandSurface *createDefaultSurface();
 protected:
diff --git a/src/compositor/compositor_api/qwaylandkeyboard_p.h b/src/compositor/compositor_api/qwaylandkeyboard_p.h
index b65dab440..47cd11d07 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard_p.h
+++ b/src/compositor/compositor_api/qwaylandkeyboard_p.h
@@ -97,9 +97,9 @@ public:
     void sendEnter(QWaylandSurface *surface, Resource *resource);
 
 protected:
-    void keyboard_bind_resource(Resource *resource) Q_DECL_OVERRIDE;
-    void keyboard_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
-    void keyboard_release(Resource *resource) Q_DECL_OVERRIDE;
+    void keyboard_bind_resource(Resource *resource) override;
+    void keyboard_destroy_resource(Resource *resource) override;
+    void keyboard_release(Resource *resource) override;
 
 private:
 #if QT_CONFIG(xkbcommon_evdev)
diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h
index 190231c12..9200ad2c4 100644
--- a/src/compositor/compositor_api/qwaylandoutput.h
+++ b/src/compositor/compositor_api/qwaylandoutput.h
@@ -183,7 +183,7 @@ private Q_SLOTS:
     void handleWindowDestroyed();
 
 protected:
-    bool event(QEvent *event) Q_DECL_OVERRIDE;
+    bool event(QEvent *event) override;
 
     virtual void initialize();
 };
diff --git a/src/compositor/compositor_api/qwaylandoutput_p.h b/src/compositor/compositor_api/qwaylandoutput_p.h
index dffde7f98..3a95f40cc 100644
--- a/src/compositor/compositor_api/qwaylandoutput_p.h
+++ b/src/compositor/compositor_api/qwaylandoutput_p.h
@@ -110,7 +110,7 @@ public:
     void sendModesInfo();
 
 protected:
-    void output_bind_resource(Resource *resource) Q_DECL_OVERRIDE;
+    void output_bind_resource(Resource *resource) override;
 
 private:
     QWaylandCompositor *compositor;
diff --git a/src/compositor/compositor_api/qwaylandpointer_p.h b/src/compositor/compositor_api/qwaylandpointer_p.h
index c02f831b7..123f6b87b 100644
--- a/src/compositor/compositor_api/qwaylandpointer_p.h
+++ b/src/compositor/compositor_api/qwaylandpointer_p.h
@@ -79,9 +79,9 @@ public:
     QWaylandCompositor *compositor() const { return seat->compositor(); }
 
 protected:
-    void pointer_set_cursor(Resource *resource, uint32_t serial, wl_resource *surface, int32_t hotspot_x, int32_t hotspot_y) Q_DECL_OVERRIDE;
-    void pointer_release(Resource *resource) Q_DECL_OVERRIDE;
-    void pointer_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
+    void pointer_set_cursor(Resource *resource, uint32_t serial, wl_resource *surface, int32_t hotspot_x, int32_t hotspot_y) override;
+    void pointer_release(Resource *resource) override;
+    void pointer_destroy_resource(Resource *resource) override;
 
 private:
     void focusDestroyed(void *data);
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
index b69e20791..a024ae39a 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
@@ -62,7 +62,7 @@ public:
     {
     }
 protected:
-    QWaylandSurface *createDefaultSurface() Q_DECL_OVERRIDE
+    QWaylandSurface *createDefaultSurface() override
     {
         return new QWaylandQuickSurface();
     }
@@ -135,7 +135,7 @@ void QWaylandQuickCompositor::grabSurface(QWaylandSurfaceGrabber *grabber, const
         QWaylandSurfaceGrabber *grabber;
         QWaylandBufferRef buffer;
 
-        void run() Q_DECL_OVERRIDE
+        void run() override
         {
             QOpenGLFramebufferObject fbo(buffer.size());
             fbo.bind();
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.h b/src/compositor/compositor_api/qwaylandquickcompositor.h
index f6fb118a0..5c4562f0c 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.h
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.h
@@ -52,13 +52,13 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickCompositor : public QWaylandCompo
     Q_OBJECT
 public:
     QWaylandQuickCompositor(QObject *parent = nullptr);
-    void create() Q_DECL_OVERRIDE;
+    void create() override;
 
-    void grabSurface(QWaylandSurfaceGrabber *grabber, const QWaylandBufferRef &buffer) Q_DECL_OVERRIDE;
+    void grabSurface(QWaylandSurfaceGrabber *grabber, const QWaylandBufferRef &buffer) override;
 
 protected:
-    void classBegin() Q_DECL_OVERRIDE;
-    void componentComplete() Q_DECL_OVERRIDE;
+    void classBegin() override;
+    void componentComplete() override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index ce477a472..ee9fa5427 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -297,7 +297,7 @@ public:
         emit textureChanged();
     }
 
-    QSGTexture *texture() const Q_DECL_OVERRIDE
+    QSGTexture *texture() const override
     {
         if (m_sgTex)
             m_sgTex->setFiltering(m_smooth ? QSGTexture::Linear : QSGTexture::Nearest);
diff --git a/src/compositor/compositor_api/qwaylandquickitem.h b/src/compositor/compositor_api/qwaylandquickitem.h
index 09f057adb..eb014a20c 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.h
+++ b/src/compositor/compositor_api/qwaylandquickitem.h
@@ -82,8 +82,8 @@ public:
 
     QWaylandSurface::Origin origin() const;
 
-    bool isTextureProvider() const Q_DECL_OVERRIDE;
-    QSGTextureProvider *textureProvider() const Q_DECL_OVERRIDE;
+    bool isTextureProvider() const override;
+    QSGTextureProvider *textureProvider() const override;
 
     bool paintEnabled() const;
     bool touchEventsEnabled() const;
@@ -103,7 +103,7 @@ public:
     void setSizeFollowsSurface(bool sizeFollowsSurface);
 
 #if QT_CONFIG(im)
-    QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE;
+    QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;
     Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const;
 #endif
 
@@ -122,24 +122,24 @@ public:
     Q_INVOKABLE void setPrimary();
 
 protected:
-    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void hoverEnterEvent(QHoverEvent *event) Q_DECL_OVERRIDE;
-    void hoverMoveEvent(QHoverEvent *event) Q_DECL_OVERRIDE;
-    void hoverLeaveEvent(QHoverEvent *event) Q_DECL_OVERRIDE;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *event) override;
+    void hoverEnterEvent(QHoverEvent *event) override;
+    void hoverMoveEvent(QHoverEvent *event) override;
+    void hoverLeaveEvent(QHoverEvent *event) override;
 #if QT_CONFIG(wheelevent)
-    void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE;
+    void wheelEvent(QWheelEvent *event) override;
 #endif
 
-    void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
-    void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent *event) override;
+    void keyReleaseEvent(QKeyEvent *event) override;
 
     void touchEvent(QTouchEvent *event) override;
     void touchUngrabEvent() override;
 
 #if QT_CONFIG(im)
-    void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE;
+    void inputMethodEvent(QInputMethodEvent *event) override;
 #endif
 
     virtual void surfaceChangedEvent(QWaylandSurface *newSurface, QWaylandSurface *oldSurface);
@@ -179,7 +179,7 @@ Q_SIGNALS:
     void bufferLockedChanged();
     void allowDiscardFrontBufferChanged();
 protected:
-    QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
+    QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
 
     QWaylandQuickItem(QWaylandQuickItemPrivate &dd, QQuickItem *parent = nullptr);
 };
diff --git a/src/compositor/compositor_api/qwaylandquickitem_p.h b/src/compositor/compositor_api/qwaylandquickitem_p.h
index 18693a738..fe8fbfd12 100644
--- a/src/compositor/compositor_api/qwaylandquickitem_p.h
+++ b/src/compositor/compositor_api/qwaylandquickitem_p.h
@@ -66,11 +66,11 @@ class QWaylandBufferMaterialShader : public QSGMaterialShader
 public:
     QWaylandBufferMaterialShader(QWaylandBufferRef::BufferFormatEgl format);
 
-    void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) Q_DECL_OVERRIDE;
-    char const *const *attributeNames() const Q_DECL_OVERRIDE;
+    void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) override;
+    char const *const *attributeNames() const override;
 
 protected:
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
 
 private:
     const QWaylandBufferRef::BufferFormatEgl m_format;
@@ -89,8 +89,8 @@ public:
 
     void bind();
 
-    QSGMaterialType *type() const Q_DECL_OVERRIDE;
-    QSGMaterialShader *createShader() const Q_DECL_OVERRIDE;
+    QSGMaterialType *type() const override;
+    QSGMaterialShader *createShader() const override;
 
 private:
     void setTextureParameters(GLenum target);
diff --git a/src/compositor/compositor_api/qwaylandquickoutput.h b/src/compositor/compositor_api/qwaylandquickoutput.h
index 2cef03282..1e6ca479f 100644
--- a/src/compositor/compositor_api/qwaylandquickoutput.h
+++ b/src/compositor/compositor_api/qwaylandquickoutput.h
@@ -54,7 +54,7 @@ public:
     QWaylandQuickOutput();
     QWaylandQuickOutput(QWaylandCompositor *compositor, QWindow *window);
 
-    void update() Q_DECL_OVERRIDE;
+    void update() override;
 
     bool automaticFrameCallback() const;
     void setAutomaticFrameCallback(bool automatic);
@@ -68,7 +68,7 @@ Q_SIGNALS:
     void automaticFrameCallbackChanged();
 
 protected:
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
 
 private:
     void doFrameCallbacks();
diff --git a/src/compositor/compositor_api/qwaylandseat_p.h b/src/compositor/compositor_api/qwaylandseat_p.h
index 1d6870802..4e0b61ba5 100644
--- a/src/compositor/compositor_api/qwaylandseat_p.h
+++ b/src/compositor/compositor_api/qwaylandseat_p.h
@@ -97,16 +97,16 @@ public:
     QtWayland::DataDevice *dataDevice() const { return data_device.data(); }
 
 protected:
-    void seat_bind_resource(wl_seat::Resource *resource) Q_DECL_OVERRIDE;
+    void seat_bind_resource(wl_seat::Resource *resource) override;
 
     void seat_get_pointer(wl_seat::Resource *resource,
-                          uint32_t id) Q_DECL_OVERRIDE;
+                          uint32_t id) override;
     void seat_get_keyboard(wl_seat::Resource *resource,
-                           uint32_t id) Q_DECL_OVERRIDE;
+                           uint32_t id) override;
     void seat_get_touch(wl_seat::Resource *resource,
-                        uint32_t id) Q_DECL_OVERRIDE;
+                        uint32_t id) override;
 
-    void seat_destroy_resource(wl_seat::Resource *resource) Q_DECL_OVERRIDE;
+    void seat_destroy_resource(wl_seat::Resource *resource) override;
 
 private:
     bool isInitialized;
diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h
index 135d78732..aea6eda98 100644
--- a/src/compositor/compositor_api/qwaylandsurface_p.h
+++ b/src/compositor/compositor_api/qwaylandsurface_p.h
@@ -117,22 +117,22 @@ public:
     QWaylandSurfacePrivate *parentSurface() const { return subsurface ? subsurface->parentSurface : nullptr; }
 
 protected:
-    void surface_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
+    void surface_destroy_resource(Resource *resource) override;
 
-    void surface_destroy(Resource *resource) Q_DECL_OVERRIDE;
+    void surface_destroy(Resource *resource) override;
     void surface_attach(Resource *resource,
-                        struct wl_resource *buffer, int x, int y) Q_DECL_OVERRIDE;
+                        struct wl_resource *buffer, int x, int y) override;
     void surface_damage(Resource *resource,
-                        int32_t x, int32_t y, int32_t width, int32_t height) Q_DECL_OVERRIDE;
+                        int32_t x, int32_t y, int32_t width, int32_t height) override;
     void surface_frame(Resource *resource,
-                       uint32_t callback) Q_DECL_OVERRIDE;
+                       uint32_t callback) override;
     void surface_set_opaque_region(Resource *resource,
-                                   struct wl_resource *region) Q_DECL_OVERRIDE;
+                                   struct wl_resource *region) override;
     void surface_set_input_region(Resource *resource,
-                                  struct wl_resource *region) Q_DECL_OVERRIDE;
-    void surface_commit(Resource *resource) Q_DECL_OVERRIDE;
-    void surface_set_buffer_transform(Resource *resource, int32_t transform) Q_DECL_OVERRIDE;
-    void surface_set_buffer_scale(Resource *resource, int32_t bufferScale) Q_DECL_OVERRIDE;
+                                  struct wl_resource *region) override;
+    void surface_commit(Resource *resource) override;
+    void surface_set_buffer_transform(Resource *resource, int32_t transform) override;
+    void surface_set_buffer_scale(Resource *resource, int32_t bufferScale) override;
 
     QtWayland::ClientBuffer *getBuffer(struct ::wl_resource *buffer);
 
diff --git a/src/compositor/compositor_api/qwaylandtouch_p.h b/src/compositor/compositor_api/qwaylandtouch_p.h
index 9ee3e9c17..e5f6d3f8c 100644
--- a/src/compositor/compositor_api/qwaylandtouch_p.h
+++ b/src/compositor/compositor_api/qwaylandtouch_p.h
@@ -76,7 +76,7 @@ public:
     uint sendUp(QWaylandClient *client, uint32_t time, int touch_id);
 
 private:
-    void touch_release(Resource *resource) Q_DECL_OVERRIDE;
+    void touch_release(Resource *resource) override;
 
     QWaylandSeat *seat;
 };
diff --git a/src/compositor/extensions/qwaylandiviapplication.h b/src/compositor/extensions/qwaylandiviapplication.h
index a3e057a86..c3497b96d 100644
--- a/src/compositor/extensions/qwaylandiviapplication.h
+++ b/src/compositor/extensions/qwaylandiviapplication.h
@@ -56,7 +56,7 @@ public:
     QWaylandIviApplication();
     QWaylandIviApplication(QWaylandCompositor *compositor);
 
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
 
     static const struct wl_interface *interface();
     static QByteArray interfaceName();
diff --git a/src/compositor/extensions/qwaylandiviapplication_p.h b/src/compositor/extensions/qwaylandiviapplication_p.h
index ea211a84a..609a945e8 100644
--- a/src/compositor/extensions/qwaylandiviapplication_p.h
+++ b/src/compositor/extensions/qwaylandiviapplication_p.h
@@ -71,7 +71,7 @@ public:
     QHash<uint, QWaylandIviSurface*> m_iviSurfaces;
 
 protected:
-    void ivi_application_surface_create(Resource *resource, uint32_t ivi_id, wl_resource *surface, uint32_t id) Q_DECL_OVERRIDE;
+    void ivi_application_surface_create(Resource *resource, uint32_t ivi_id, wl_resource *surface, uint32_t id) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/compositor/extensions/qwaylandivisurface.h b/src/compositor/extensions/qwaylandivisurface.h
index ec5365077..669a1e2de 100644
--- a/src/compositor/extensions/qwaylandivisurface.h
+++ b/src/compositor/extensions/qwaylandivisurface.h
@@ -73,7 +73,7 @@ public:
     Q_INVOKABLE void sendConfigure(const QSize &size);
 
 #ifdef QT_WAYLAND_COMPOSITOR_QUICK
-    QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) Q_DECL_OVERRIDE;
+    QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) override;
 #endif
 
 Q_SIGNALS:
@@ -81,7 +81,7 @@ Q_SIGNALS:
     void iviIdChanged();
 
 private:
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/compositor/extensions/qwaylandivisurface_p.h b/src/compositor/extensions/qwaylandivisurface_p.h
index db237721d..8cbec4148 100644
--- a/src/compositor/extensions/qwaylandivisurface_p.h
+++ b/src/compositor/extensions/qwaylandivisurface_p.h
@@ -68,8 +68,8 @@ public:
     static QWaylandIviSurfacePrivate *get(QWaylandIviSurface *iviSurface) { return iviSurface->d_func(); }
 
 protected:
-    void ivi_surface_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
-    void ivi_surface_destroy(Resource *resource) Q_DECL_OVERRIDE;
+    void ivi_surface_destroy_resource(Resource *resource) override;
+    void ivi_surface_destroy(Resource *resource) override;
 
 private:
     QWaylandIviApplication *m_iviApplication;
diff --git a/src/compositor/extensions/qwaylandqtwindowmanager.h b/src/compositor/extensions/qwaylandqtwindowmanager.h
index 4d3951025..7265abc33 100644
--- a/src/compositor/extensions/qwaylandqtwindowmanager.h
+++ b/src/compositor/extensions/qwaylandqtwindowmanager.h
@@ -61,7 +61,7 @@ public:
 
     void sendQuitMessage(QWaylandClient *client);
 
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
 
     static const struct wl_interface *interface();
     static QByteArray interfaceName();
diff --git a/src/compositor/extensions/qwaylandqtwindowmanager_p.h b/src/compositor/extensions/qwaylandqtwindowmanager_p.h
index a6df2138f..992ee6e62 100644
--- a/src/compositor/extensions/qwaylandqtwindowmanager_p.h
+++ b/src/compositor/extensions/qwaylandqtwindowmanager_p.h
@@ -66,9 +66,9 @@ public:
     QWaylandQtWindowManagerPrivate();
 
 protected:
-    void windowmanager_bind_resource(Resource *resource) Q_DECL_OVERRIDE;
-    void windowmanager_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
-    void windowmanager_open_url(Resource *resource, uint32_t remaining, const QString &url) Q_DECL_OVERRIDE;
+    void windowmanager_bind_resource(Resource *resource) override;
+    void windowmanager_destroy_resource(Resource *resource) override;
+    void windowmanager_open_url(Resource *resource, uint32_t remaining, const QString &url) override;
 
 private:
     bool showIsFullScreen;
diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.h b/src/compositor/extensions/qwaylandquickshellsurfaceitem.h
index f72b970c2..de03163cc 100644
--- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.h
+++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem.h
@@ -67,8 +67,8 @@ Q_SIGNALS:
 protected:
     QWaylandQuickShellSurfaceItem(QWaylandQuickShellSurfaceItemPrivate &dd, QQuickItem *parent);
 
-    void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+    void mouseMoveEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *event) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
index 3cd9bf228..b9eb5ad62 100644
--- a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
+++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
@@ -90,13 +90,13 @@ public:
     static void cancelFilter();
 
 protected:
-    void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
+    void timerEvent(QTimerEvent *event) override;
 
 private:
     void stopFilter();
 
     QWaylandQuickShellEventFilter(QObject *parent = nullptr);
-    bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *, QEvent *) override;
     bool eventFilterInstalled;
     bool waitForRelease;
     QPointer<QWaylandClient> client;
diff --git a/src/compositor/extensions/qwaylandshell.h b/src/compositor/extensions/qwaylandshell.h
index 997573c95..4a9d28cba 100644
--- a/src/compositor/extensions/qwaylandshell.h
+++ b/src/compositor/extensions/qwaylandshell.h
@@ -81,7 +81,7 @@ public:
         : QWaylandShell(container)
     { }
 
-    const struct wl_interface *extensionInterface() const Q_DECL_OVERRIDE
+    const struct wl_interface *extensionInterface() const override
     {
         return T::interface();
     }
diff --git a/src/compositor/extensions/qwaylandshellsurface.h b/src/compositor/extensions/qwaylandshellsurface.h
index e8c75327c..1df9fed0e 100644
--- a/src/compositor/extensions/qwaylandshellsurface.h
+++ b/src/compositor/extensions/qwaylandshellsurface.h
@@ -73,7 +73,7 @@ public:
         : QWaylandShellSurface(container)
     { }
 
-    const struct wl_interface *extensionInterface() const Q_DECL_OVERRIDE
+    const struct wl_interface *extensionInterface() const override
     {
         return T::interface();
     }
diff --git a/src/compositor/extensions/qwaylandtextinput_p.h b/src/compositor/extensions/qwaylandtextinput_p.h
index da90cc90b..7af24bb25 100644
--- a/src/compositor/extensions/qwaylandtextinput_p.h
+++ b/src/compositor/extensions/qwaylandtextinput_p.h
@@ -115,19 +115,19 @@ public:
     QHash<Resource *, QWaylandSurface*> enabledSurfaces;
 
 protected:
-    void zwp_text_input_v2_bind_resource(Resource *resource) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
-
-    void zwp_text_input_v2_destroy(Resource *resource) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_enable(Resource *resource, wl_resource *surface) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_disable(Resource *resource, wl_resource *surface) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_show_input_panel(Resource *resource) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_hide_input_panel(Resource *resource) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_set_surrounding_text(Resource *resource, const QString &text, int32_t cursor, int32_t anchor) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_set_content_type(Resource *resource, uint32_t hint, uint32_t purpose) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_set_cursor_rectangle(Resource *resource, int32_t x, int32_t y, int32_t width, int32_t height) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_set_preferred_language(Resource *resource, const QString &language) Q_DECL_OVERRIDE;
-    void zwp_text_input_v2_update_state(Resource *resource, uint32_t serial, uint32_t flags) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_bind_resource(Resource *resource) override;
+    void zwp_text_input_v2_destroy_resource(Resource *resource) override;
+
+    void zwp_text_input_v2_destroy(Resource *resource) override;
+    void zwp_text_input_v2_enable(Resource *resource, wl_resource *surface) override;
+    void zwp_text_input_v2_disable(Resource *resource, wl_resource *surface) override;
+    void zwp_text_input_v2_show_input_panel(Resource *resource) override;
+    void zwp_text_input_v2_hide_input_panel(Resource *resource) override;
+    void zwp_text_input_v2_set_surrounding_text(Resource *resource, const QString &text, int32_t cursor, int32_t anchor) override;
+    void zwp_text_input_v2_set_content_type(Resource *resource, uint32_t hint, uint32_t purpose) override;
+    void zwp_text_input_v2_set_cursor_rectangle(Resource *resource, int32_t x, int32_t y, int32_t width, int32_t height) override;
+    void zwp_text_input_v2_set_preferred_language(Resource *resource, const QString &language) override;
+    void zwp_text_input_v2_update_state(Resource *resource, uint32_t serial, uint32_t flags) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/compositor/extensions/qwaylandtextinputmanager.h b/src/compositor/extensions/qwaylandtextinputmanager.h
index 805c61af8..4691ed0cd 100644
--- a/src/compositor/extensions/qwaylandtextinputmanager.h
+++ b/src/compositor/extensions/qwaylandtextinputmanager.h
@@ -53,7 +53,7 @@ public:
     QWaylandTextInputManager();
     QWaylandTextInputManager(QWaylandCompositor *compositor);
 
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
 
     static const struct wl_interface *interface();
     static QByteArray interfaceName();
diff --git a/src/compositor/extensions/qwaylandtextinputmanager_p.h b/src/compositor/extensions/qwaylandtextinputmanager_p.h
index 955a5cc8a..5034f7e4d 100644
--- a/src/compositor/extensions/qwaylandtextinputmanager_p.h
+++ b/src/compositor/extensions/qwaylandtextinputmanager_p.h
@@ -61,7 +61,7 @@ public:
     QWaylandTextInputManagerPrivate();
 
 protected:
-    void zwp_text_input_manager_v2_get_text_input(Resource *resource, uint32_t id, struct ::wl_resource *seatResource) Q_DECL_OVERRIDE;
+    void zwp_text_input_manager_v2_get_text_input(Resource *resource, uint32_t id, struct ::wl_resource *seatResource) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/compositor/extensions/qwaylandwlshell.h b/src/compositor/extensions/qwaylandwlshell.h
index 7fe07e7a9..1ecc15cd6 100644
--- a/src/compositor/extensions/qwaylandwlshell.h
+++ b/src/compositor/extensions/qwaylandwlshell.h
@@ -63,7 +63,7 @@ public:
     QWaylandWlShell();
     QWaylandWlShell(QWaylandCompositor *compositor);
 
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
     QList<QWaylandWlShellSurface *> shellSurfaces() const;
     QList<QWaylandWlShellSurface *> shellSurfacesForClient(QWaylandClient* client) const;
     QList<QWaylandWlShellSurface *> mappedPopups() const;
@@ -136,7 +136,7 @@ public:
     Q_INVOKABLE void sendPopupDone();
 
 #ifdef QT_WAYLAND_COMPOSITOR_QUICK
-    QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) Q_DECL_OVERRIDE;
+    QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) override;
 #endif
 
 public Q_SLOTS:
diff --git a/src/compositor/extensions/qwaylandwlshell_p.h b/src/compositor/extensions/qwaylandwlshell_p.h
index 77229ef03..70fd45f7d 100644
--- a/src/compositor/extensions/qwaylandwlshell_p.h
+++ b/src/compositor/extensions/qwaylandwlshell_p.h
@@ -76,7 +76,7 @@ public:
     static QWaylandWlShellPrivate *get(QWaylandWlShell *shell) { return shell->d_func(); }
 
 protected:
-    void shell_get_shell_surface(Resource *resource, uint32_t id, struct ::wl_resource *surface) Q_DECL_OVERRIDE;
+    void shell_get_shell_surface(Resource *resource, uint32_t id, struct ::wl_resource *surface) override;
 
     QList<QWaylandWlShellSurface *> m_shellSurfaces;
 };
@@ -106,40 +106,40 @@ private:
     QString m_className;
     Qt::WindowType m_windowType;
 
-    void shell_surface_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
+    void shell_surface_destroy_resource(Resource *resource) override;
 
     void shell_surface_move(Resource *resource,
                             struct wl_resource *input_device_super,
-                            uint32_t time) Q_DECL_OVERRIDE;
+                            uint32_t time) override;
     void shell_surface_resize(Resource *resource,
                               struct wl_resource *input_device,
                               uint32_t time,
-                              uint32_t edges) Q_DECL_OVERRIDE;
-    void shell_surface_set_toplevel(Resource *resource) Q_DECL_OVERRIDE;
+                              uint32_t edges) override;
+    void shell_surface_set_toplevel(Resource *resource) override;
     void shell_surface_set_transient(Resource *resource,
                                      struct wl_resource *parent_surface_resource,
                                      int x,
                                      int y,
-                                     uint32_t flags) Q_DECL_OVERRIDE;
+                                     uint32_t flags) override;
     void shell_surface_set_fullscreen(Resource *resource,
                                       uint32_t method,
                                       uint32_t framerate,
-                                      struct wl_resource *output_resource) Q_DECL_OVERRIDE;
+                                      struct wl_resource *output_resource) override;
     void shell_surface_set_popup(Resource *resource,
                                  struct wl_resource *input_device,
                                  uint32_t time,
                                  struct wl_resource *parent,
                                  int32_t x,
                                  int32_t y,
-                                 uint32_t flags) Q_DECL_OVERRIDE;
+                                 uint32_t flags) override;
     void shell_surface_set_maximized(Resource *resource,
-                                     struct wl_resource *output_resource) Q_DECL_OVERRIDE;
+                                     struct wl_resource *output_resource) override;
     void shell_surface_pong(Resource *resource,
-                            uint32_t serial) Q_DECL_OVERRIDE;
+                            uint32_t serial) override;
     void shell_surface_set_title(Resource *resource,
-                                 const QString &title) Q_DECL_OVERRIDE;
+                                 const QString &title) override;
     void shell_surface_set_class(Resource *resource,
-                                 const QString &class_) Q_DECL_OVERRIDE;
+                                 const QString &class_) override;
 
     static QWaylandSurfaceRole s_role;
 };
diff --git a/src/compositor/extensions/qwaylandwlshellintegration_p.h b/src/compositor/extensions/qwaylandwlshellintegration_p.h
index d5ecffac1..814f5e12d 100644
--- a/src/compositor/extensions/qwaylandwlshellintegration_p.h
+++ b/src/compositor/extensions/qwaylandwlshellintegration_p.h
@@ -61,8 +61,8 @@ class WlShellIntegration : public QWaylandQuickShellIntegration
     Q_OBJECT
 public:
     WlShellIntegration(QWaylandQuickShellSurfaceItem *item);
-    bool mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    bool mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+    bool mouseMoveEvent(QMouseEvent *event) override;
+    bool mouseReleaseEvent(QMouseEvent *event) override;
 
 private Q_SLOTS:
     void handleStartMove(QWaylandSeat *seat);
diff --git a/src/compositor/extensions/qwaylandxdgshellv5.h b/src/compositor/extensions/qwaylandxdgshellv5.h
index b465e92e6..269ea8934 100644
--- a/src/compositor/extensions/qwaylandxdgshellv5.h
+++ b/src/compositor/extensions/qwaylandxdgshellv5.h
@@ -68,7 +68,7 @@ public:
     QWaylandXdgShellV5();
     QWaylandXdgShellV5(QWaylandCompositor *compositor);
 
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
     QWaylandClient *popupClient() const;
 
     static const struct wl_interface *interface();
@@ -167,7 +167,7 @@ public:
     Q_INVOKABLE uint sendResizing(const QSize &maxSize);
 
 #ifdef QT_WAYLAND_COMPOSITOR_QUICK
-    QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) Q_DECL_OVERRIDE;
+    QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) override;
 #endif
 
 Q_SIGNALS:
@@ -238,7 +238,7 @@ public:
     Q_INVOKABLE void sendPopupDone();
 
 #ifdef QT_WAYLAND_COMPOSITOR_QUICK
-    QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) Q_DECL_OVERRIDE;
+    QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) override;
 #endif
 
 Q_SIGNALS:
diff --git a/src/compositor/extensions/qwaylandxdgshellv5_p.h b/src/compositor/extensions/qwaylandxdgshellv5_p.h
index acc93e834..8e74a6a20 100644
--- a/src/compositor/extensions/qwaylandxdgshellv5_p.h
+++ b/src/compositor/extensions/qwaylandxdgshellv5_p.h
@@ -80,14 +80,14 @@ public:
     QWaylandXdgSurfaceV5 *xdgSurfaceFromSurface(QWaylandSurface *surface);
 
 protected:
-    void xdg_shell_destroy(Resource *resource) Q_DECL_OVERRIDE;
+    void xdg_shell_destroy(Resource *resource) override;
     void xdg_shell_get_xdg_surface(Resource *resource, uint32_t id,
-                                   struct ::wl_resource *surface) Q_DECL_OVERRIDE;
-    void xdg_shell_use_unstable_version(Resource *resource, int32_t version) Q_DECL_OVERRIDE;
+                                   struct ::wl_resource *surface) override;
+    void xdg_shell_use_unstable_version(Resource *resource, int32_t version) override;
     void xdg_shell_get_xdg_popup(Resource *resource, uint32_t id, struct ::wl_resource *surface,
                                  struct ::wl_resource *parent, struct ::wl_resource *seatResource,
-                                 uint32_t serial, int32_t x, int32_t y) Q_DECL_OVERRIDE;
-    void xdg_shell_pong(Resource *resource, uint32_t serial) Q_DECL_OVERRIDE;
+                                 uint32_t serial, int32_t x, int32_t y) override;
+    void xdg_shell_pong(Resource *resource, uint32_t serial) override;
 };
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgSurfaceV5Private
@@ -128,27 +128,27 @@ private:
     ConfigureEvent m_lastAckedConfigure;
     ConfigureEvent lastSentConfigure() const { return m_pendingConfigures.empty() ? m_lastAckedConfigure : m_pendingConfigures.first(); }
 
-    void xdg_surface_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
+    void xdg_surface_destroy_resource(Resource *resource) override;
 
-    void xdg_surface_destroy(Resource *resource) Q_DECL_OVERRIDE;
+    void xdg_surface_destroy(Resource *resource) override;
     void xdg_surface_move(Resource *resource, struct ::wl_resource *seat,
-                          uint32_t serial) Q_DECL_OVERRIDE;
+                          uint32_t serial) override;
     void xdg_surface_resize(Resource *resource, struct ::wl_resource *seat, uint32_t serial,
-                            uint32_t edges) Q_DECL_OVERRIDE;
-    void xdg_surface_set_maximized(Resource *resource) Q_DECL_OVERRIDE;
-    void xdg_surface_unset_maximized(Resource *resource) Q_DECL_OVERRIDE;
+                            uint32_t edges) override;
+    void xdg_surface_set_maximized(Resource *resource) override;
+    void xdg_surface_unset_maximized(Resource *resource) override;
     void xdg_surface_set_fullscreen(Resource *resource,
-                                    struct ::wl_resource *output) Q_DECL_OVERRIDE;
-    void xdg_surface_unset_fullscreen(Resource *resource) Q_DECL_OVERRIDE;
-    void xdg_surface_set_minimized(Resource *resource) Q_DECL_OVERRIDE;
-    void xdg_surface_set_parent(Resource *resource, struct ::wl_resource *parent) Q_DECL_OVERRIDE;
-    void xdg_surface_set_app_id(Resource *resource, const QString &app_id) Q_DECL_OVERRIDE;
+                                    struct ::wl_resource *output) override;
+    void xdg_surface_unset_fullscreen(Resource *resource) override;
+    void xdg_surface_set_minimized(Resource *resource) override;
+    void xdg_surface_set_parent(Resource *resource, struct ::wl_resource *parent) override;
+    void xdg_surface_set_app_id(Resource *resource, const QString &app_id) override;
     void xdg_surface_show_window_menu(Resource *resource, struct ::wl_resource *seatResource,
-                                      uint32_t serial, int32_t x, int32_t y) Q_DECL_OVERRIDE;
-    void xdg_surface_ack_configure(Resource *resource, uint32_t serial) Q_DECL_OVERRIDE;
-    void xdg_surface_set_title(Resource *resource, const QString &title) Q_DECL_OVERRIDE;
+                                      uint32_t serial, int32_t x, int32_t y) override;
+    void xdg_surface_ack_configure(Resource *resource, uint32_t serial) override;
+    void xdg_surface_set_title(Resource *resource, const QString &title) override;
     void xdg_surface_set_window_geometry(Resource *resource, int32_t x, int32_t y,
-                                         int32_t width, int32_t height) Q_DECL_OVERRIDE;
+                                         int32_t width, int32_t height) override;
 
     static QWaylandSurfaceRole s_role;
 };
@@ -168,8 +168,8 @@ public:
     QWaylandXdgShellV5 *m_xdgShell;
     QPoint m_position;
 
-    void xdg_popup_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
-    void xdg_popup_destroy(xdg_popup::Resource *resource) Q_DECL_OVERRIDE;
+    void xdg_popup_destroy_resource(Resource *resource) override;
+    void xdg_popup_destroy(xdg_popup::Resource *resource) override;
 
     static QWaylandSurfaceRole s_role;
 };
diff --git a/src/compositor/extensions/qwaylandxdgshellv5integration_p.h b/src/compositor/extensions/qwaylandxdgshellv5integration_p.h
index da4573c76..6f02ab399 100644
--- a/src/compositor/extensions/qwaylandxdgshellv5integration_p.h
+++ b/src/compositor/extensions/qwaylandxdgshellv5integration_p.h
@@ -60,8 +60,8 @@ class XdgShellV5Integration : public QWaylandQuickShellIntegration
     Q_OBJECT
 public:
     XdgShellV5Integration(QWaylandQuickShellSurfaceItem *item);
-    bool mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    bool mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+    bool mouseMoveEvent(QMouseEvent *event) override;
+    bool mouseReleaseEvent(QMouseEvent *event) override;
 
 private Q_SLOTS:
     void handleStartMove(QWaylandSeat *seat);
diff --git a/src/compositor/extensions/qwlextendedsurface_p.h b/src/compositor/extensions/qwlextendedsurface_p.h
index a868cd831..2317d1a45 100644
--- a/src/compositor/extensions/qwlextendedsurface_p.h
+++ b/src/compositor/extensions/qwlextendedsurface_p.h
@@ -136,17 +136,17 @@ private:
 
     void extended_surface_update_generic_property(Resource *resource,
                                                   const QString &name,
-                                                  struct wl_array *value) Q_DECL_OVERRIDE;
+                                                  struct wl_array *value) override;
 
     void extended_surface_set_content_orientation_mask(Resource *resource,
-                                                       int32_t orientation) Q_DECL_OVERRIDE;
+                                                       int32_t orientation) override;
 
     void extended_surface_set_window_flags(Resource *resource,
-                                           int32_t flags) Q_DECL_OVERRIDE;
+                                           int32_t flags) override;
 
-    void extended_surface_destroy_resource(Resource *) Q_DECL_OVERRIDE;
-    void extended_surface_raise(Resource *) Q_DECL_OVERRIDE;
-    void extended_surface_lower(Resource *) Q_DECL_OVERRIDE;
+    void extended_surface_destroy_resource(Resource *) override;
+    void extended_surface_raise(Resource *) override;
+    void extended_surface_lower(Resource *) override;
 };
 
 }
diff --git a/src/compositor/extensions/qwlqttouch_p.h b/src/compositor/extensions/qwlqttouch_p.h
index f3697aa83..d659872ae 100644
--- a/src/compositor/extensions/qwlqttouch_p.h
+++ b/src/compositor/extensions/qwlqttouch_p.h
@@ -86,8 +86,8 @@ Q_SIGNALS:
     void behaviorFlagsChanged();
 
 protected:
-    void touch_extension_bind_resource(Resource *resource) Q_DECL_OVERRIDE;
-    void touch_extension_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
+    void touch_extension_bind_resource(Resource *resource) override;
+    void touch_extension_destroy_resource(Resource *resource) override;
 
 private:
     QWaylandCompositor *m_compositor;
diff --git a/src/compositor/global/qwaylandcompositorextension.h b/src/compositor/global/qwaylandcompositorextension.h
index e9aa84609..fe8a7ff1e 100644
--- a/src/compositor/global/qwaylandcompositorextension.h
+++ b/src/compositor/global/qwaylandcompositorextension.h
@@ -89,7 +89,7 @@ protected:
     QWaylandCompositorExtension(QWaylandCompositorExtensionPrivate &dd);
     QWaylandCompositorExtension(QWaylandObject *container, QWaylandCompositorExtensionPrivate &dd);
 
-    bool event(QEvent *event) Q_DECL_OVERRIDE;
+    bool event(QEvent *event) override;
 };
 
 template <typename T>
@@ -104,7 +104,7 @@ public:
         : QWaylandCompositorExtension(container)
     { }
 
-    const struct wl_interface *extensionInterface() const Q_DECL_OVERRIDE
+    const struct wl_interface *extensionInterface() const override
     {
         return T::interface();
     }
diff --git a/src/compositor/global/qwaylandquickextension.h b/src/compositor/global/qwaylandquickextension.h
index 63c3d135e..d328f7bdb 100644
--- a/src/compositor/global/qwaylandquickextension.h
+++ b/src/compositor/global/qwaylandquickextension.h
@@ -56,8 +56,8 @@ QT_BEGIN_NAMESPACE
         { \
             return QQmlListProperty<QObject>(this, m_objects); \
         } \
-        void classBegin() Q_DECL_OVERRIDE {} \
-        void componentComplete() Q_DECL_OVERRIDE { initialize(); } \
+        void classBegin() override {} \
+        void componentComplete() override { initialize(); } \
     private: \
         QList<QObject *> m_objects; \
     };
diff --git a/src/compositor/wayland_wrapper/qwlclientbuffer_p.h b/src/compositor/wayland_wrapper/qwlclientbuffer_p.h
index dafb3c5e5..efb2eb18b 100644
--- a/src/compositor/wayland_wrapper/qwlclientbuffer_p.h
+++ b/src/compositor/wayland_wrapper/qwlclientbuffer_p.h
@@ -128,12 +128,12 @@ class Q_WAYLAND_COMPOSITOR_EXPORT SharedMemoryBuffer : public ClientBuffer
 public:
     SharedMemoryBuffer(struct ::wl_resource *bufferResource);
 
-    QSize size() const Q_DECL_OVERRIDE;
-    QWaylandSurface::Origin origin() const  Q_DECL_OVERRIDE;
+    QSize size() const override;
+    QWaylandSurface::Origin origin() const  override;
     QImage image() const;
 
 #if QT_CONFIG(opengl)
-    QOpenGLTexture *toOpenGlTexture(int plane = 0) Q_DECL_OVERRIDE;
+    QOpenGLTexture *toOpenGlTexture(int plane = 0) override;
 
 private:
     QOpenGLTexture *m_shmTexture;
diff --git a/src/compositor/wayland_wrapper/qwldatadevice_p.h b/src/compositor/wayland_wrapper/qwldatadevice_p.h
index 17591ae27..57a9c0a80 100644
--- a/src/compositor/wayland_wrapper/qwldatadevice_p.h
+++ b/src/compositor/wayland_wrapper/qwldatadevice_p.h
@@ -79,8 +79,8 @@ public:
     void cancelDrag();
 
 protected:
-    void data_device_start_drag(Resource *resource, struct ::wl_resource *source, struct ::wl_resource *origin, struct ::wl_resource *icon, uint32_t serial) Q_DECL_OVERRIDE;
-    void data_device_set_selection(Resource *resource, struct ::wl_resource *source, uint32_t serial) Q_DECL_OVERRIDE;
+    void data_device_start_drag(Resource *resource, struct ::wl_resource *source, struct ::wl_resource *origin, struct ::wl_resource *icon, uint32_t serial) override;
+    void data_device_set_selection(Resource *resource, struct ::wl_resource *source, uint32_t serial) override;
 
 private:
     void setDragIcon(QWaylandSurface *icon);
diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
index 8408db977..483731dfd 100644
--- a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
+++ b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
@@ -85,8 +85,8 @@ public:
     void offerRetainedSelection(wl_resource *clientDataDeviceResource);
 
 protected:
-    void data_device_manager_create_data_source(Resource *resource, uint32_t id) Q_DECL_OVERRIDE;
-    void data_device_manager_get_data_device(Resource *resource, uint32_t id, struct ::wl_resource *seat) Q_DECL_OVERRIDE;
+    void data_device_manager_create_data_source(Resource *resource, uint32_t id) override;
+    void data_device_manager_get_data_device(Resource *resource, uint32_t id, struct ::wl_resource *seat) override;
 
 private Q_SLOTS:
     void readFromClient(int fd);
diff --git a/src/compositor/wayland_wrapper/qwldataoffer_p.h b/src/compositor/wayland_wrapper/qwldataoffer_p.h
index 09ca87650..dc1c84fe0 100644
--- a/src/compositor/wayland_wrapper/qwldataoffer_p.h
+++ b/src/compositor/wayland_wrapper/qwldataoffer_p.h
@@ -65,10 +65,10 @@ public:
     ~DataOffer();
 
 protected:
-    void data_offer_accept(Resource *resource, uint32_t serial, const QString &mime_type) Q_DECL_OVERRIDE;
-    void data_offer_receive(Resource *resource, const QString &mime_type, int32_t fd) Q_DECL_OVERRIDE;
-    void data_offer_destroy(Resource *resource) Q_DECL_OVERRIDE;
-    void data_offer_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
+    void data_offer_accept(Resource *resource, uint32_t serial, const QString &mime_type) override;
+    void data_offer_receive(Resource *resource, const QString &mime_type, int32_t fd) override;
+    void data_offer_destroy(Resource *resource) override;
+    void data_offer_destroy_resource(Resource *resource) override;
 
 private:
     QPointer<DataSource> m_dataSource;
diff --git a/src/compositor/wayland_wrapper/qwldatasource_p.h b/src/compositor/wayland_wrapper/qwldatasource_p.h
index 4389b40fb..b548a2411 100644
--- a/src/compositor/wayland_wrapper/qwldatasource_p.h
+++ b/src/compositor/wayland_wrapper/qwldatasource_p.h
@@ -78,9 +78,9 @@ public:
     static DataSource *fromResource(struct ::wl_resource *resource);
 
 protected:
-    void data_source_offer(Resource *resource, const QString &mime_type) Q_DECL_OVERRIDE;
-    void data_source_destroy(Resource *resource) Q_DECL_OVERRIDE;
-    void data_source_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
+    void data_source_offer(Resource *resource, const QString &mime_type) override;
+    void data_source_destroy(Resource *resource) override;
+    void data_source_destroy_resource(Resource *resource) override;
 
 private:
     uint32_t m_time;
diff --git a/src/compositor/wayland_wrapper/qwlregion_p.h b/src/compositor/wayland_wrapper/qwlregion_p.h
index c63cdbc45..c5047596e 100644
--- a/src/compositor/wayland_wrapper/qwlregion_p.h
+++ b/src/compositor/wayland_wrapper/qwlregion_p.h
@@ -76,11 +76,11 @@ private:
 
     QRegion m_region;
 
-    void region_destroy_resource(Resource *) Q_DECL_OVERRIDE;
+    void region_destroy_resource(Resource *) override;
 
-    void region_destroy(Resource *resource) Q_DECL_OVERRIDE;
-    void region_add(Resource *resource, int32_t x, int32_t y, int32_t w, int32_t h) Q_DECL_OVERRIDE;
-    void region_subtract(Resource *resource, int32_t x, int32_t y, int32_t w, int32_t h) Q_DECL_OVERRIDE;
+    void region_destroy(Resource *resource) override;
+    void region_add(Resource *resource, int32_t x, int32_t y, int32_t w, int32_t h) override;
+    void region_subtract(Resource *resource, int32_t x, int32_t y, int32_t w, int32_t h) override;
 };
 
 }
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
index 6f1e4d920..0a913bcdf 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
@@ -66,13 +66,13 @@ public:
     QWaylandBrcmEglIntegration();
     ~QWaylandBrcmEglIntegration();
 
-    void initialize(QWaylandDisplay *waylandDisplay) Q_DECL_OVERRIDE;
+    void initialize(QWaylandDisplay *waylandDisplay) override;
 
-    bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE { return true; }
-    bool supportsWindowDecoration() const Q_DECL_OVERRIDE { return false; }
+    bool supportsThreadedOpenGL() const override { return true; }
+    bool supportsWindowDecoration() const override { return false; }
 
     QWaylandWindow *createEglWindow(QWindow *window);
-    QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const Q_DECL_OVERRIDE;
+    QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const override;
 
     EGLDisplay eglDisplay() const;
 
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
index 5874fb60f..be88df9af 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
@@ -60,10 +60,10 @@ class QWaylandBrcmEglWindow : public QWaylandWindow
 public:
     QWaylandBrcmEglWindow(QWindow *window);
     ~QWaylandBrcmEglWindow();
-    WindowType windowType() const Q_DECL_OVERRIDE;
-    void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
+    WindowType windowType() const override;
+    void setGeometry(const QRect &rect) override;
 
-    QSurfaceFormat format() const Q_DECL_OVERRIDE;
+    QSurfaceFormat format() const 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 a79cfcc68..ee8bc86fe 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
@@ -58,14 +58,14 @@ public:
     QWaylandBrcmGLContext(EGLDisplay eglDisplay, const QSurfaceFormat &format, QPlatformOpenGLContext *share);
     ~QWaylandBrcmGLContext();
 
-    void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE;
+    void swapBuffers(QPlatformSurface *surface) override;
 
-    bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE;
-    void doneCurrent() Q_DECL_OVERRIDE;
+    bool makeCurrent(QPlatformSurface *surface) override;
+    void doneCurrent() override;
 
-    void (*getProcAddress(const char *procName)) () Q_DECL_OVERRIDE;
+    void (*getProcAddress(const char *procName)) () override;
 
-    QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; }
+    QSurfaceFormat format() const override { return m_format; }
 
     EGLConfig eglConfig() const;
     EGLContext eglContext() const { return m_context; }
diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
index e55eee540..f848f190e 100644
--- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
+++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
@@ -71,7 +71,7 @@ class DrmServerBuffer : public QWaylandServerBuffer
 public:
     DrmServerBuffer(DrmEglServerBufferIntegration *integration, int32_t name, int32_t width, int32_t height, int32_t stride, int32_t format);
     ~DrmServerBuffer();
-    void bindTextureToBuffer() Q_DECL_OVERRIDE;
+    void bindTextureToBuffer() override;
 private:
     DrmEglServerBufferIntegration *m_integration;
     EGLImageKHR m_image;
@@ -83,16 +83,16 @@ class DrmEglServerBufferIntegration
     , public QtWayland::qt_drm_egl_server_buffer
 {
 public:
-    void initialize(QWaylandDisplay *display) Q_DECL_OVERRIDE;
+    void initialize(QWaylandDisplay *display) override;
 
-    virtual QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) Q_DECL_OVERRIDE;
+    virtual QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) override;
 
     inline EGLImageKHR eglCreateImageKHR(EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
     inline EGLBoolean eglDestroyImageKHR (EGLImageKHR image);
     inline void glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
 protected:
-    void registry_global(uint32_t name, const QString &interface, uint32_t version) Q_DECL_OVERRIDE;
-    void drm_egl_server_buffer_server_buffer_created(struct ::qt_server_buffer *id, int32_t name, int32_t width, int32_t height, int32_t stride, int32_t format) Q_DECL_OVERRIDE;
+    void registry_global(uint32_t name, const QString &interface, uint32_t version) override;
+    void drm_egl_server_buffer_server_buffer_created(struct ::qt_server_buffer *id, int32_t name, int32_t width, int32_t height, int32_t stride, int32_t format) override;
 private:
     PFNEGLCREATEIMAGEKHRPROC m_egl_create_image;
     PFNEGLDESTROYIMAGEKHRPROC m_egl_destroy_image;
diff --git a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h
index 5e5bade0f..e9f0689a2 100644
--- a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h
+++ b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h
@@ -75,10 +75,10 @@ class LibHybrisServerBuffer : public QWaylandServerBuffer, public QtWayland::qt_
 public:
     LibHybrisServerBuffer(LibHybrisEglServerBufferIntegration *integration, int32_t numFds, wl_array *ints, int32_t name, int32_t width, int32_t height, int32_t stride, int32_t format);
     ~LibHybrisServerBuffer();
-    void bindTextureToBuffer() Q_DECL_OVERRIDE;
+    void bindTextureToBuffer() override;
 
 protected:
-    void libhybris_buffer_add_fd(int32_t fd) Q_DECL_OVERRIDE;
+    void libhybris_buffer_add_fd(int32_t fd) override;
 
 private:
     LibHybrisEglServerBufferIntegration *m_integration;
@@ -96,9 +96,9 @@ class LibHybrisEglServerBufferIntegration
     , public QtWayland::qt_libhybris_egl_server_buffer
 {
 public:
-    void initialize(QWaylandDisplay *display) Q_DECL_OVERRIDE;
+    void initialize(QWaylandDisplay *display) override;
 
-    virtual QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) Q_DECL_OVERRIDE;
+    virtual QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) override;
 
     inline EGLImageKHR eglCreateImageKHR(EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
     inline EGLBoolean eglDestroyImageKHR (EGLImageKHR image);
@@ -106,9 +106,9 @@ public:
     inline EGLBoolean eglHybrisCreateRemoteBuffer(EGLint width, EGLint height, EGLint usage, EGLint format, EGLint stride, int num_ints, int *ints, int num_fds, int *fds, EGLClientBuffer *buffer);
 
 protected:
-    void registry_global(uint32_t name, const QString &interface, uint32_t version) Q_DECL_OVERRIDE;
+    void registry_global(uint32_t name, const QString &interface, uint32_t version) override;
     void libhybris_egl_server_buffer_server_buffer_created(struct ::qt_libhybris_buffer *id, struct ::qt_server_buffer *qid,
-                                                           int32_t numFds, wl_array *ints, int32_t name, int32_t width, int32_t height, int32_t stride, int32_t format) Q_DECL_OVERRIDE;
+                                                           int32_t numFds, wl_array *ints, int32_t name, int32_t width, int32_t height, int32_t stride, int32_t format) override;
 private:
     PFNEGLCREATEIMAGEKHRPROC m_egl_create_image;
     PFNEGLDESTROYIMAGEKHRPROC m_egl_destroy_image;
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h
index 2faa02ecf..427a30d8e 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h
@@ -58,16 +58,16 @@ public:
     QWaylandEglClientBufferIntegration();
     ~QWaylandEglClientBufferIntegration();
 
-    void initialize(QWaylandDisplay *display) Q_DECL_OVERRIDE;
-    bool isValid() const Q_DECL_OVERRIDE;
-    bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE;
-    bool supportsWindowDecoration() const Q_DECL_OVERRIDE;
+    void initialize(QWaylandDisplay *display) override;
+    bool isValid() const override;
+    bool supportsThreadedOpenGL() const override;
+    bool supportsWindowDecoration() const override;
 
-    QWaylandWindow *createEglWindow(QWindow *window) Q_DECL_OVERRIDE;
-    QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const Q_DECL_OVERRIDE;
+    QWaylandWindow *createEglWindow(QWindow *window) override;
+    QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const override;
 
-    void *nativeResource(NativeResource resource) Q_DECL_OVERRIDE;
-    void *nativeResourceForContext(NativeResource resource, QPlatformOpenGLContext *context) Q_DECL_OVERRIDE;
+    void *nativeResource(NativeResource resource) override;
+    void *nativeResourceForContext(NativeResource resource, QPlatformOpenGLContext *context) override;
 
     EGLDisplay eglDisplay() const;
 
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
index bf656689a..e471a8f7c 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
@@ -58,10 +58,10 @@ class QWaylandEglWindow : public QWaylandWindow
 public:
     QWaylandEglWindow(QWindow *window);
     ~QWaylandEglWindow();
-    WindowType windowType() const Q_DECL_OVERRIDE;
+    WindowType windowType() const override;
 
     void updateSurface(bool create);
-    virtual void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
+    virtual void setGeometry(const QRect &rect) override;
     QRect contentsRect() const;
 
     EGLSurface eglSurface() const;
@@ -69,12 +69,12 @@ public:
     GLuint contentTexture() const;
     bool needToUpdateContentFBO() const { return decoration() && (m_resize || !m_contentFBO); }
 
-    QSurfaceFormat format() const Q_DECL_OVERRIDE;
+    QSurfaceFormat format() const override;
 
     void bindContentFBO();
 
-    void invalidateSurface() Q_DECL_OVERRIDE;
-    void setVisible(bool visible) Q_DECL_OVERRIDE;
+    void invalidateSurface() override;
+    void setVisible(bool visible) override;
 
 private Q_SLOTS:
     void doInvalidateSurface();
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
index d528b2327..6d9887de6 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
@@ -63,19 +63,19 @@ public:
     QWaylandGLContext(EGLDisplay eglDisplay, QWaylandDisplay *display, const QSurfaceFormat &format, QPlatformOpenGLContext *share);
     ~QWaylandGLContext();
 
-    void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE;
+    void swapBuffers(QPlatformSurface *surface) override;
 
-    bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE;
-    void doneCurrent() Q_DECL_OVERRIDE;
+    bool makeCurrent(QPlatformSurface *surface) override;
+    void doneCurrent() override;
 
-    GLuint defaultFramebufferObject(QPlatformSurface *surface) const Q_DECL_OVERRIDE;
+    GLuint defaultFramebufferObject(QPlatformSurface *surface) const override;
 
-    bool isSharing() const Q_DECL_OVERRIDE;
-    bool isValid() const Q_DECL_OVERRIDE;
+    bool isSharing() const override;
+    bool isValid() const override;
 
-    QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE;
+    QFunctionPointer getProcAddress(const char *procName) override;
 
-    QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; }
+    QSurfaceFormat format() const 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 612421bed..cdc071e55 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
@@ -75,10 +75,10 @@ public:
     QWaylandXCompositeEGLClientBufferIntegration();
     ~QWaylandXCompositeEGLClientBufferIntegration();
 
-    void initialize(QWaylandDisplay *dispaly) Q_DECL_OVERRIDE;
+    void initialize(QWaylandDisplay *dispaly) override;
 
-    QWaylandWindow *createEglWindow(QWindow *window) Q_DECL_OVERRIDE;
-    QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const Q_DECL_OVERRIDE;
+    QWaylandWindow *createEglWindow(QWindow *window) override;
+    QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const override;
 
     QWaylandDisplay *waylandDisplay() const;
     struct qt_xcomposite *waylandXComposite() const;
@@ -88,8 +88,8 @@ public:
     int screen() const;
     Window rootWindow() const;
 
-    bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE { return true; }
-    bool supportsWindowDecoration() const Q_DECL_OVERRIDE { return false; }
+    bool supportsThreadedOpenGL() const override { return true; }
+    bool supportsWindowDecoration() const 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 83a643757..e0b70bf21 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
@@ -57,10 +57,10 @@ class QWaylandXCompositeEGLContext : public QEGLPlatformContext
 public:
     QWaylandXCompositeEGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, EGLConfig config);
 
-    void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE;
+    void swapBuffers(QPlatformSurface *surface) override;
 
 private:
-    EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) Q_DECL_OVERRIDE;
+    EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) override;
 };
 
 }
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
index 1203c7ee8..5b7d492c5 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
@@ -54,9 +54,9 @@ class QWaylandXCompositeEGLWindow : public QWaylandWindow
 {
 public:
     QWaylandXCompositeEGLWindow(QWindow *window, QWaylandXCompositeEGLClientBufferIntegration *glxIntegration);
-    WindowType windowType() const Q_DECL_OVERRIDE;
+    WindowType windowType() const override;
 
-    void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
+    void setGeometry(const QRect &rect) override;
 
     EGLSurface eglSurface() const;
 
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
index 5847ea976..d95f57be7 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
@@ -57,14 +57,14 @@ class QWaylandXCompositeGLXContext : public QPlatformOpenGLContext
 public:
     QWaylandXCompositeGLXContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, Display *display, int screen);
 
-    QSurfaceFormat format() const Q_DECL_OVERRIDE;
+    QSurfaceFormat format() const override;
 
-    void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE;
+    void swapBuffers(QPlatformSurface *surface) override;
 
-    bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE;
-    void doneCurrent() Q_DECL_OVERRIDE;
+    bool makeCurrent(QPlatformSurface *surface) override;
+    void doneCurrent() override;
 
-    QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE;
+    QFunctionPointer getProcAddress(const char *procName) override;
 
 private:
     GLXContext m_context;
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
index bd8fe4108..288bf3111 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
@@ -70,10 +70,10 @@ public:
     QWaylandXCompositeGLXIntegration();
     ~QWaylandXCompositeGLXIntegration();
 
-    void initialize(QWaylandDisplay *display) Q_DECL_OVERRIDE;
+    void initialize(QWaylandDisplay *display) override;
 
-    QWaylandWindow *createEglWindow(QWindow *window) Q_DECL_OVERRIDE;
-    QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const Q_DECL_OVERRIDE;
+    QWaylandWindow *createEglWindow(QWindow *window) override;
+    QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const override;
 
     QWaylandDisplay *waylandDisplay() const;
     struct qt_xcomposite *waylandXComposite() const;
@@ -82,8 +82,8 @@ public:
     int screen() const;
     Window rootWindow() const;
 
-    bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE { return false; }
-    bool supportsWindowDecoration() const Q_DECL_OVERRIDE { return false; }
+    bool supportsThreadedOpenGL() const override { return false; }
+    bool supportsWindowDecoration() const 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 7318044f3..aeb5c14ec 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h
@@ -56,9 +56,9 @@ class QWaylandXCompositeGLXWindow : public QWaylandWindow
 {
 public:
     QWaylandXCompositeGLXWindow(QWindow *window, QWaylandXCompositeGLXIntegration *glxIntegration);
-    WindowType windowType() const Q_DECL_OVERRIDE;
+    WindowType windowType() const override;
 
-    void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
+    void setGeometry(const QRect &rect) override;
 
     Window xWindow() const;
 
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h
index ef6f613b8..479e05c1b 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h
@@ -62,8 +62,8 @@ public:
     static BrcmBuffer *fromResource(struct ::wl_resource *resource) { return static_cast<BrcmBuffer*>(Resource::fromResource(resource)->buffer_object); }
 
 protected:
-    void buffer_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
-    void buffer_destroy(Resource *resource) Q_DECL_OVERRIDE;
+    void buffer_destroy_resource(Resource *resource) override;
+    void buffer_destroy(Resource *resource) override;
 
 private:
     QVector<EGLint> m_handle;
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
index a1d39e4fe..402f51b98 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
@@ -54,12 +54,12 @@ class BrcmEglIntegration : public QtWayland::ClientBufferIntegration, public QtW
 public:
     BrcmEglIntegration();
 
-    void initializeHardware(struct ::wl_display *display) Q_DECL_OVERRIDE;
-    QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) Q_DECL_OVERRIDE;
+    void initializeHardware(struct ::wl_display *display) override;
+    QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) override;
 
 protected:
-    void brcm_bind_resource(Resource *resource) Q_DECL_OVERRIDE;
-    void brcm_create_buffer(Resource *resource, uint32_t id, int32_t width, int32_t height, wl_array *data) Q_DECL_OVERRIDE;
+    void brcm_bind_resource(Resource *resource) override;
+    void brcm_create_buffer(Resource *resource, uint32_t id, int32_t width, int32_t height, wl_array *data) override;
 
 private:
     Q_DISABLE_COPY(BrcmEglIntegration)
@@ -71,10 +71,10 @@ class BrcmEglClientBuffer : public QtWayland::ClientBuffer
 public:
     BrcmEglClientBuffer(BrcmEglIntegration *integration, wl_resource *buffer);
 
-    QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const Q_DECL_OVERRIDE;
-    QSize size() const Q_DECL_OVERRIDE;
-    QWaylandSurface::Origin origin() const Q_DECL_OVERRIDE;
-    QOpenGLTexture *toOpenGlTexture(int plane) Q_DECL_OVERRIDE;
+    QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const override;
+    QSize size() const override;
+    QWaylandSurface::Origin origin() const override;
+    QOpenGLTexture *toOpenGlTexture(int plane) override;
 private:
     BrcmEglIntegration *m_integration;
     QOpenGLTexture *m_texture;
diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
index 5cd7bcf5b..d9072b069 100644
--- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
+++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
@@ -75,8 +75,8 @@ class DrmEglServerBuffer : public QtWayland::ServerBuffer, public QtWaylandServe
 public:
     DrmEglServerBuffer(DrmEglServerBufferIntegration *integration, const QSize &size, QtWayland::ServerBuffer::Format format);
 
-    struct ::wl_resource *resourceForClient(struct ::wl_client *) Q_DECL_OVERRIDE;
-    void bindTextureToBuffer() Q_DECL_OVERRIDE;
+    struct ::wl_resource *resourceForClient(struct ::wl_client *) override;
+    void bindTextureToBuffer() override;
 
 private:
     DrmEglServerBufferIntegration *m_integration;
@@ -98,8 +98,8 @@ public:
 
     void initializeHardware(QWaylandCompositor *);
 
-    bool supportsFormat(QtWayland::ServerBuffer::Format format) const Q_DECL_OVERRIDE;
-    QtWayland::ServerBuffer *createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format) Q_DECL_OVERRIDE;
+    bool supportsFormat(QtWayland::ServerBuffer::Format format) const override;
+    QtWayland::ServerBuffer *createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format) override;
 
     EGLDisplay display() const { return m_egl_display; }
 
diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h
index 572c681be..130654d63 100644
--- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h
+++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h
@@ -77,8 +77,8 @@ class LibHybrisEglServerBuffer : public QtWayland::ServerBuffer, public QtWaylan
 public:
     LibHybrisEglServerBuffer(LibHybrisEglServerBufferIntegration *integration, const QSize &size, QtWayland::ServerBuffer::Format format);
 
-    struct ::wl_resource *resourceForClient(struct ::wl_client *) Q_DECL_OVERRIDE;
-    void bindTextureToBuffer() Q_DECL_OVERRIDE;
+    struct ::wl_resource *resourceForClient(struct ::wl_client *) override;
+    void bindTextureToBuffer() override;
 
 private:
     LibHybrisEglServerBufferIntegration *m_integration;
@@ -104,8 +104,8 @@ public:
 
     void initializeHardware(QWaylandCompositor *);
 
-    bool supportsFormat(QtWayland::ServerBuffer::Format format) const Q_DECL_OVERRIDE;
-    QtWayland::ServerBuffer *createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format) Q_DECL_OVERRIDE;
+    bool supportsFormat(QtWayland::ServerBuffer::Format format) const override;
+    QtWayland::ServerBuffer *createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format) override;
 
     EGLDisplay display() const { return m_egl_display; }
 
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
index c93ce1dd8..e0235d84c 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
@@ -51,7 +51,7 @@ class WaylandEglClientBufferIntegration : public QtWayland::ClientBufferIntegrat
 public:
     WaylandEglClientBufferIntegration();
 
-    void initializeHardware(struct ::wl_display *display) Q_DECL_OVERRIDE;
+    void initializeHardware(struct ::wl_display *display) override;
 
     QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer);
 
@@ -65,13 +65,13 @@ struct BufferState;
 class WaylandEglClientBuffer : public QtWayland::ClientBuffer
 {
 public:
-    QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const Q_DECL_OVERRIDE;
-    QSize size() const Q_DECL_OVERRIDE;
-    QWaylandSurface::Origin origin() const Q_DECL_OVERRIDE;
-    quintptr lockNativeBuffer() Q_DECL_OVERRIDE;
-    void unlockNativeBuffer(quintptr native_buffer) const Q_DECL_OVERRIDE;
-    QOpenGLTexture *toOpenGlTexture(int plane) Q_DECL_OVERRIDE;
-    void setCommitted(QRegion &damage) Q_DECL_OVERRIDE;
+    QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const override;
+    QSize size() const override;
+    QWaylandSurface::Origin origin() const override;
+    quintptr lockNativeBuffer() override;
+    void unlockNativeBuffer(quintptr native_buffer) const override;
+    QOpenGLTexture *toOpenGlTexture(int plane) override;
+    void setCommitted(QRegion &damage) override;
 
 private:
     friend class WaylandEglClientBufferIntegration;
diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
index ec4ea284b..fb869b2e7 100644
--- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
@@ -52,8 +52,8 @@ class XCompositeEglClientBufferIntegration : public QtWayland::ClientBufferInteg
 public:
     XCompositeEglClientBufferIntegration();
 
-    void initializeHardware(struct ::wl_display *display) Q_DECL_OVERRIDE;
-    QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) Q_DECL_OVERRIDE;
+    void initializeHardware(struct ::wl_display *display) override;
+    QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) override;
     inline Display *xDisplay() const { return mDisplay; }
     inline EGLDisplay eglDisplay() const { return mEglDisplay; }
 
@@ -69,8 +69,8 @@ public:
 
     QSize size() const;
     QWaylandSurface::Origin origin() const;
-    QOpenGLTexture *toOpenGlTexture(int plane) Q_DECL_OVERRIDE;
-    QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const Q_DECL_OVERRIDE {
+    QOpenGLTexture *toOpenGlTexture(int plane) override;
+    QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const override {
         return QWaylandBufferRef::BufferFormatEgl_RGBA;
     }
 
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
index 7b63f976e..2776ad353 100644
--- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
+++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
@@ -55,8 +55,8 @@ public:
     XCompositeGLXClientBufferIntegration();
     ~XCompositeGLXClientBufferIntegration();
 
-    void initializeHardware(struct ::wl_display *display) Q_DECL_OVERRIDE;
-    QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) Q_DECL_OVERRIDE;
+    void initializeHardware(struct ::wl_display *display) override;
+    QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) override;
 
     inline Display *xDisplay() const { return mDisplay; }
     inline int xScreen() const { return mScreen; }
@@ -77,8 +77,8 @@ public:
 
     QSize size() const;
     QWaylandSurface::Origin origin() const;
-    QOpenGLTexture *toOpenGlTexture(int plane) Q_DECL_OVERRIDE;
-    QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const Q_DECL_OVERRIDE {
+    QOpenGLTexture *toOpenGlTexture(int plane) override;
+    QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const override {
         return QWaylandBufferRef::BufferFormatEgl_RGBA;
     }
 
diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h b/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h
index 318b17873..6f17f7e39 100644
--- a/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h
+++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h
@@ -68,8 +68,8 @@ public:
     static XCompositeBuffer *fromResource(struct ::wl_resource *resource) { return static_cast<XCompositeBuffer*>(Resource::fromResource(resource)->buffer_object); }
 
 protected:
-    void buffer_destroy_resource(Resource *) Q_DECL_OVERRIDE;
-    void buffer_destroy(Resource *) Q_DECL_OVERRIDE;
+    void buffer_destroy_resource(Resource *) override;
+    void buffer_destroy(Resource *) override;
 
 private:
     Window mWindow;
diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h
index 482224b66..b2a612068 100644
--- a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h
+++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.h
@@ -56,9 +56,9 @@ private:
 
     QString mDisplayString;
 
-    void xcomposite_bind_resource(Resource *resource) Q_DECL_OVERRIDE;
+    void xcomposite_bind_resource(Resource *resource) override;
     void xcomposite_create_buffer(Resource *resource, uint32_t id, uint32_t x_window,
-                                  int32_t width, int32_t height) Q_DECL_OVERRIDE;
+                                  int32_t width, int32_t height) override;
 
 };
 
diff --git a/src/imports/compositor/qwaylandmousetracker_p.h b/src/imports/compositor/qwaylandmousetracker_p.h
index 45c80208a..9132457ad 100644
--- a/src/imports/compositor/qwaylandmousetracker_p.h
+++ b/src/imports/compositor/qwaylandmousetracker_p.h
@@ -71,11 +71,11 @@ signals:
     void hoveredChanged();
 
 protected:
-    bool childMouseEventFilter(QQuickItem *item, QEvent *event) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void hoverMoveEvent(QHoverEvent *event) Q_DECL_OVERRIDE;
-    void hoverEnterEvent(QHoverEvent *event) Q_DECL_OVERRIDE;
-    void hoverLeaveEvent(QHoverEvent *event) Q_DECL_OVERRIDE;
+    bool childMouseEventFilter(QQuickItem *item, QEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+    void hoverMoveEvent(QHoverEvent *event) override;
+    void hoverEnterEvent(QHoverEvent *event) override;
+    void hoverLeaveEvent(QHoverEvent *event) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/decorations/bradient/main.cpp b/src/plugins/decorations/bradient/main.cpp
index 3928a9f10..074c74522 100644
--- a/src/plugins/decorations/bradient/main.cpp
+++ b/src/plugins/decorations/bradient/main.cpp
@@ -135,10 +135,10 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandBradientDecoration : public QWaylandAbstra
 public:
     QWaylandBradientDecoration();
 protected:
-    QMargins margins() const Q_DECL_OVERRIDE;
-    void paint(QPaintDevice *device) Q_DECL_OVERRIDE;
-    bool handleMouse(QWaylandInputDevice *inputDevice, const QPointF &local, const QPointF &global,Qt::MouseButtons b,Qt::KeyboardModifiers mods) Q_DECL_OVERRIDE;
-    bool handleTouch(QWaylandInputDevice *inputDevice, const QPointF &local, const QPointF &global, Qt::TouchPointState state, Qt::KeyboardModifiers mods) Q_DECL_OVERRIDE;
+    QMargins margins() const override;
+    void paint(QPaintDevice *device) override;
+    bool handleMouse(QWaylandInputDevice *inputDevice, const QPointF &local, const QPointF &global,Qt::MouseButtons b,Qt::KeyboardModifiers mods) override;
+    bool handleTouch(QWaylandInputDevice *inputDevice, const QPointF &local, const QPointF &global, Qt::TouchPointState state, Qt::KeyboardModifiers mods) override;
 private:
     void processMouseTop(QWaylandInputDevice *inputDevice, const QPointF &local, Qt::MouseButtons b,Qt::KeyboardModifiers mods);
     void processMouseBottom(QWaylandInputDevice *inputDevice, const QPointF &local, Qt::MouseButtons b,Qt::KeyboardModifiers mods);
@@ -486,7 +486,7 @@ class QWaylandBradientDecorationPlugin : public QWaylandDecorationPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QWaylandDecorationFactoryInterface_iid FILE "bradient.json")
 public:
-    QWaylandAbstractDecoration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QWaylandAbstractDecoration *create(const QString&, const QStringList&) override;
 };
 
 QWaylandAbstractDecoration *QWaylandBradientDecorationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/hardwareintegration/client/brcm-egl/main.cpp b/src/plugins/hardwareintegration/client/brcm-egl/main.cpp
index ea66995d4..4f5a2ae3c 100644
--- a/src/plugins/hardwareintegration/client/brcm-egl/main.cpp
+++ b/src/plugins/hardwareintegration/client/brcm-egl/main.cpp
@@ -49,7 +49,7 @@ class QWaylandBrcmEglClientBufferPlugin : public QWaylandClientBufferIntegration
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QWaylandClientBufferIntegrationFactoryInterface_iid FILE "brcm-egl.json")
 public:
-    QWaylandClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QWaylandClientBufferIntegration *create(const QString&, const QStringList&) override;
 };
 
 QWaylandClientBufferIntegration *QWaylandBrcmEglClientBufferPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp b/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp
index 9149d588c..70c9e300a 100644
--- a/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp
+++ b/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp
@@ -49,7 +49,7 @@ class DrmEglServerBufferPlugin : public QWaylandServerBufferIntegrationPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QWaylandServerBufferIntegrationFactoryInterface_iid FILE "drm-egl-server.json")
 public:
-    QWaylandServerBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QWaylandServerBufferIntegration *create(const QString&, const QStringList&) override;
 };
 
 QWaylandServerBufferIntegration *DrmEglServerBufferPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp b/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp
index f7ae0cdfa..417597c36 100644
--- a/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp
+++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp
@@ -49,7 +49,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&) Q_DECL_OVERRIDE;
+    QWaylandServerBufferIntegration *create(const QString&, const QStringList&) override;
 };
 
 QWaylandServerBufferIntegration *LibHybrisEglServerBufferPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/hardwareintegration/client/wayland-egl/main.cpp b/src/plugins/hardwareintegration/client/wayland-egl/main.cpp
index 364e18aff..05053ff95 100644
--- a/src/plugins/hardwareintegration/client/wayland-egl/main.cpp
+++ b/src/plugins/hardwareintegration/client/wayland-egl/main.cpp
@@ -49,7 +49,7 @@ class QWaylandEglClientBufferPlugin : public QWaylandClientBufferIntegrationPlug
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QWaylandClientBufferIntegrationFactoryInterface_iid FILE "wayland-egl.json")
 public:
-    QWaylandClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QWaylandClientBufferIntegration *create(const QString&, const QStringList&) override;
 };
 
 QWaylandClientBufferIntegration *QWaylandEglClientBufferPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp
index ea4f39705..07222f237 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp
+++ b/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp
@@ -49,7 +49,7 @@ class QWaylandXCompositeEglClientBufferIntegrationPlugin : public QWaylandClient
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-egl.json")
 public:
-    QWaylandClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QWaylandClientBufferIntegration *create(const QString&, const QStringList&) override;
 };
 
 QWaylandClientBufferIntegration *QWaylandXCompositeEglClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp
index 0a04f716c..00fa255b5 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp
+++ b/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp
@@ -49,7 +49,7 @@ class QWaylandXCompositeGlxClientBufferIntegrationPlugin : public QWaylandClient
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-glx.json")
 public:
-    QWaylandClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QWaylandClientBufferIntegration *create(const QString&, const QStringList&) override;
 };
 
 QWaylandClientBufferIntegration *QWaylandXCompositeGlxClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
index b977f9199..1f57274cd 100644
--- a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
@@ -47,7 +47,7 @@ class QWaylandBrcmClientBufferIntegrationPlugin : public QtWayland::ClientBuffer
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "brcm-egl.json")
 public:
-    QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) override;
 };
 
 QtWayland::ClientBufferIntegration *QWaylandBrcmClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp
index 6ce6ba7fb..768db5673 100644
--- a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp
@@ -47,7 +47,7 @@ class DrmEglServerBufferIntegrationPlugin : public QtWayland::ServerBufferIntegr
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QtWaylandServerBufferIntegrationFactoryInterface_iid FILE "drm-egl-server.json")
 public:
-    QtWayland::ServerBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QtWayland::ServerBufferIntegration *create(const QString&, const QStringList&) override;
 };
 
 QtWayland::ServerBufferIntegration *DrmEglServerBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
index 1f0ab32d6..4cf151972 100644
--- a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
@@ -48,7 +48,7 @@ class QWaylandEglClientBufferIntegrationPlugin : public QtWayland::ClientBufferI
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "wayland-egl.json")
 public:
-    QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) override;
 };
 
 QtWayland::ClientBufferIntegration *QWaylandEglClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
index 48ddf5894..b9724bfe4 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
@@ -47,7 +47,7 @@ class QWaylandXCompositeEglClientBufferIntegrationPlugin : public QtWayland::Cli
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-egl.json")
 public:
-    QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) override;
 };
 
 QtWayland::ClientBufferIntegration *QWaylandXCompositeEglClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
index fbd0d8cea..b94711c92 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
@@ -47,7 +47,7 @@ class QWaylandXCompositeGlxClientBufferIntegrationPlugin : public QtWayland::Cli
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-glx.json")
 public:
-    QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) override;
 };
 
 QtWayland::ClientBufferIntegration *QWaylandXCompositeGlxClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/platforms/qwayland-brcm-egl/main.cpp b/src/plugins/platforms/qwayland-brcm-egl/main.cpp
index d1b3c733c..2640c8ea0 100644
--- a/src/plugins/platforms/qwayland-brcm-egl/main.cpp
+++ b/src/plugins/platforms/qwayland-brcm-egl/main.cpp
@@ -49,7 +49,7 @@ class QWaylandBrcmEglPlatformIntegrationPlugin : public QPlatformIntegrationPlug
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-brcm-egl.json")
 public:
-    QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QPlatformIntegration *create(const QString&, const QStringList&) override;
 };
 
 QPlatformIntegration *QWaylandBrcmEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h b/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h
index d496e5add..035846736 100644
--- a/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h
+++ b/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h
@@ -57,7 +57,7 @@ public:
         m_gl_integration->initialize(display());
     }
 
-    QWaylandClientBufferIntegration *clientBufferIntegration() const Q_DECL_OVERRIDE
+    QWaylandClientBufferIntegration *clientBufferIntegration() const override
     {
         return m_gl_integration;
     }
diff --git a/src/plugins/platforms/qwayland-egl/main.cpp b/src/plugins/platforms/qwayland-egl/main.cpp
index d6999d4af..ebeeff39f 100644
--- a/src/plugins/platforms/qwayland-egl/main.cpp
+++ b/src/plugins/platforms/qwayland-egl/main.cpp
@@ -49,7 +49,7 @@ class QWaylandEglPlatformIntegrationPlugin : public QPlatformIntegrationPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-egl.json")
 public:
-    QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QPlatformIntegration *create(const QString&, const QStringList&) override;
 };
 
 QPlatformIntegration *QWaylandEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/platforms/qwayland-generic/main.cpp b/src/plugins/platforms/qwayland-generic/main.cpp
index 24ecf0baf..08295c97c 100644
--- a/src/plugins/platforms/qwayland-generic/main.cpp
+++ b/src/plugins/platforms/qwayland-generic/main.cpp
@@ -49,7 +49,7 @@ class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-generic.json")
 public:
-    QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QPlatformIntegration *create(const QString&, const QStringList&) override;
 };
 
 QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
index 321182ad5..996f60848 100644
--- a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
+++ b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
@@ -49,7 +49,7 @@ class QWaylandXCompositeEglPlatformIntegrationPlugin : public QPlatformIntegrati
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-xcomposite-egl.json")
 public:
-    QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QPlatformIntegration *create(const QString&, const QStringList&) override;
 };
 
 QPlatformIntegration *QWaylandXCompositeEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h
index 5d7665439..009a12f67 100644
--- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h
+++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h
@@ -58,7 +58,7 @@ public:
         m_client_buffer_integration->initialize(display());
     }
 
-    QWaylandClientBufferIntegration *clientBufferIntegration() const Q_DECL_OVERRIDE
+    QWaylandClientBufferIntegration *clientBufferIntegration() const override
     { return m_client_buffer_integration; }
 
 private:
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
index fdeda6e1a..9f075ebb7 100644
--- a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
+++ b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
@@ -51,7 +51,7 @@ class QWaylandXCompositeGlxPlatformIntegrationPlugin : public QPlatformIntegrati
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-xcomposite-glx.json")
 public:
-    QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QPlatformIntegration *create(const QString&, const QStringList&) override;
 };
 
 QPlatformIntegration *QWaylandXCompositeGlxPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h
index ccc395535..a8a70bdd9 100644
--- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h
+++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h
@@ -59,7 +59,7 @@ public:
         m_client_buffer_integration->initialize(display());
     }
 
-    QWaylandClientBufferIntegration *clientBufferIntegration() const Q_DECL_OVERRIDE
+    QWaylandClientBufferIntegration *clientBufferIntegration() const override
     { return m_client_buffer_integration; }
 
 private:
diff --git a/src/plugins/shellintegration/ivi-shell/main.cpp b/src/plugins/shellintegration/ivi-shell/main.cpp
index c7af9b157..70ffdb898 100644
--- a/src/plugins/shellintegration/ivi-shell/main.cpp
+++ b/src/plugins/shellintegration/ivi-shell/main.cpp
@@ -44,7 +44,7 @@ class QWaylandIviShellIntegrationPlugin : public QWaylandShellIntegrationPlugin
     Q_PLUGIN_METADATA(IID QWaylandShellIntegrationFactoryInterface_iid FILE "ivi-shell.json")
 
 public:
-    virtual QWaylandShellIntegration *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE;
+    virtual QWaylandShellIntegration *create(const QString &key, const QStringList &paramList) override;
 };
 
 QWaylandShellIntegration *QWaylandIviShellIntegrationPlugin::create(const QString &key, const QStringList &paramList)
diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h
index ef1c7609a..5a0bfbdc0 100644
--- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h
+++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h
@@ -54,7 +54,7 @@ public:
     QWaylandIviShellIntegration();
     ~QWaylandIviShellIntegration();
     bool initialize(QWaylandDisplay *display);
-    virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) Q_DECL_OVERRIDE;
+    virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override;
 
 private:
     static void registryIvi(void *data, struct wl_registry *registry,
diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
index 9ac81ad61..f96eb3c10 100644
--- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
+++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
@@ -60,7 +60,7 @@ public:
 
 private:
     void createExtendedSurface(QWaylandWindow *window);
-    virtual void ivi_surface_configure(int32_t width, int32_t height) Q_DECL_OVERRIDE;
+    virtual void ivi_surface_configure(int32_t width, int32_t height) override;
 
     QWaylandWindow *m_window;
     QWaylandExtendedSurface *m_extendedWindow;
diff --git a/tests/auto/client/client/mockinput.h b/tests/auto/client/client/mockinput.h
index 7e88ffb0f..9c217b6ac 100644
--- a/tests/auto/client/client/mockinput.h
+++ b/tests/auto/client/client/mockinput.h
@@ -54,10 +54,10 @@ public:
     Touch *touch() const { return m_touch.data(); }
 
 protected:
-    void seat_bind_resource(Resource *resource) Q_DECL_OVERRIDE;
-    void seat_get_keyboard(Resource *resource, uint32_t id) Q_DECL_OVERRIDE;
-    void seat_get_pointer(Resource *resource, uint32_t id) Q_DECL_OVERRIDE;
-    void seat_get_touch(Resource *resource, uint32_t id) Q_DECL_OVERRIDE;
+    void seat_bind_resource(Resource *resource) override;
+    void seat_get_keyboard(Resource *resource, uint32_t id) override;
+    void seat_get_pointer(Resource *resource, uint32_t id) override;
+    void seat_get_touch(Resource *resource, uint32_t id) override;
 
 private:
     Compositor *m_compositor;
@@ -80,7 +80,7 @@ public:
     void sendKey(uint32_t key, uint32_t state);
 
 protected:
-    void keyboard_destroy_resource(wl_keyboard::Resource *resource) Q_DECL_OVERRIDE;
+    void keyboard_destroy_resource(wl_keyboard::Resource *resource) override;
 
 private:
     Compositor *m_compositor;
@@ -103,7 +103,7 @@ public:
     void sendButton(uint32_t button, uint32_t state);
 
 protected:
-    void pointer_destroy_resource(wl_pointer::Resource *resource) Q_DECL_OVERRIDE;
+    void pointer_destroy_resource(wl_pointer::Resource *resource) override;
 
 private:
     Compositor *m_compositor;
@@ -158,7 +158,7 @@ public:
     DataDevice *dataDevice() const;
 
 protected:
-    void data_device_manager_get_data_device(Resource *resource, uint32_t id, struct ::wl_resource *seat) Q_DECL_OVERRIDE;
+    void data_device_manager_get_data_device(Resource *resource, uint32_t id, struct ::wl_resource *seat) override;
     void data_device_manager_create_data_source(Resource *resource, uint32_t id) override;
 
 private:
diff --git a/tests/auto/client/client/mocksurface.h b/tests/auto/client/client/mocksurface.h
index d04386ac8..e34d6596e 100644
--- a/tests/auto/client/client/mocksurface.h
+++ b/tests/auto/client/client/mocksurface.h
@@ -49,16 +49,16 @@ public:
 
 protected:
 
-    void surface_destroy_resource(Resource *resource) Q_DECL_OVERRIDE;
+    void surface_destroy_resource(Resource *resource) override;
 
-    void surface_destroy(Resource *resource) Q_DECL_OVERRIDE;
+    void surface_destroy(Resource *resource) override;
     void surface_attach(Resource *resource,
-                        struct wl_resource *buffer, int x, int y) Q_DECL_OVERRIDE;
+                        struct wl_resource *buffer, int x, int y) override;
     void surface_damage(Resource *resource,
-                        int32_t x, int32_t y, int32_t width, int32_t height) Q_DECL_OVERRIDE;
+                        int32_t x, int32_t y, int32_t width, int32_t height) override;
     void surface_frame(Resource *resource,
-                       uint32_t callback) Q_DECL_OVERRIDE;
-    void surface_commit(Resource *resource) Q_DECL_OVERRIDE;
+                       uint32_t callback) override;
+    void surface_commit(Resource *resource) override;
 private:
     wl_resource *m_buffer;
 
diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
index 6aad25bb4..5e0db1a14 100644
--- a/tests/auto/client/client/tst_client.cpp
+++ b/tests/auto/client/client/tst_client.cpp
@@ -91,7 +91,7 @@ public:
         ++mouseReleaseEventCount;
     }
 
-    void touchEvent(QTouchEvent *event) Q_DECL_OVERRIDE
+    void touchEvent(QTouchEvent *event) override
     {
         ++touchEventCount;
     }
@@ -269,7 +269,7 @@ public:
     bool dragStarted;
 
 protected:
-    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE
+    void mousePressEvent(QMouseEvent *event) override
     {
         if (dragStarted)
             return;
diff --git a/tests/auto/compositor/compositor/testcompositor.h b/tests/auto/compositor/compositor/testcompositor.h
index 8eeb7ade6..d80fe3588 100644
--- a/tests/auto/compositor/compositor/testcompositor.h
+++ b/tests/auto/compositor/compositor/testcompositor.h
@@ -43,8 +43,8 @@ public slots:
     void onSurfaceAboutToBeDestroyed(QWaylandSurface *surface);
 
 protected:
-    QWaylandSeat *createSeat() Q_DECL_OVERRIDE;
-    QWaylandKeyboard *createKeyboardDevice(QWaylandSeat *seat) Q_DECL_OVERRIDE;
+    QWaylandSeat *createSeat() override;
+    QWaylandKeyboard *createKeyboardDevice(QWaylandSeat *seat) override;
 
 public:
     QList<QWaylandSurface *> surfaces;
diff --git a/tests/auto/compositor/compositor/testkeyboardgrabber.h b/tests/auto/compositor/compositor/testkeyboardgrabber.h
index 0ef595987..7f0f2c86c 100644
--- a/tests/auto/compositor/compositor/testkeyboardgrabber.h
+++ b/tests/auto/compositor/compositor/testkeyboardgrabber.h
@@ -34,10 +34,10 @@ class TestKeyboardGrabber : public QWaylandKeyboard
 public:
     TestKeyboardGrabber(QWaylandSeat *seat);
 
-    void setFocus(QWaylandSurface *surface) Q_DECL_OVERRIDE;
-    void sendKeyModifiers(QWaylandClient *client, uint32_t serial) Q_DECL_OVERRIDE;
-    void sendKeyPressEvent(uint code) Q_DECL_OVERRIDE;
-    void sendKeyReleaseEvent(uint code) Q_DECL_OVERRIDE;
+    void setFocus(QWaylandSurface *surface) override;
+    void sendKeyModifiers(QWaylandClient *client, uint32_t serial) override;
+    void sendKeyPressEvent(uint code) override;
+    void sendKeyReleaseEvent(uint code) override;
 
 signals:
     void focusedCalled();
diff --git a/tests/auto/compositor/compositor/testseat.h b/tests/auto/compositor/compositor/testseat.h
index 7fa7030fa..b9f04a2c2 100644
--- a/tests/auto/compositor/compositor/testseat.h
+++ b/tests/auto/compositor/compositor/testseat.h
@@ -42,7 +42,7 @@ public:
     TestSeat(QWaylandCompositor *compositor, QWaylandSeat::CapabilityFlags caps);
     ~TestSeat();
 
-    bool isOwner(QInputEvent *inputEvent) const Q_DECL_OVERRIDE;
+    bool isOwner(QInputEvent *inputEvent) const override;
 
     QList<QMouseEvent *> createMouseEvents(int count);
 
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index 393b9f5b7..b3ceb9e5c 100644
--- a/tests/auto/compositor/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/compositor/tst_compositor.cpp
@@ -315,7 +315,7 @@ void tst_WaylandCompositor::frameCallback()
     class BufferView : public QWaylandView
     {
     public:
-        void bufferCommitted(const QWaylandBufferRef &ref, const QRegion &damage) Q_DECL_OVERRIDE
+        void bufferCommitted(const QWaylandBufferRef &ref, const QRegion &damage) override
         {
             Q_UNUSED(damage);
             bufferRef = ref;
@@ -529,7 +529,7 @@ void tst_WaylandCompositor::sendsXdgConfigure()
     {
     public:
         MockXdgSurface(::xdg_surface *xdgSurface) : QtWayland::xdg_surface(xdgSurface) {}
-        void xdg_surface_configure(int32_t width, int32_t height, wl_array *rawStates, uint32_t serial) Q_DECL_OVERRIDE
+        void xdg_surface_configure(int32_t width, int32_t height, wl_array *rawStates, uint32_t serial) override
         {
             configureSize = QSize(width, height);
             configureSerial = serial;
@@ -729,7 +729,7 @@ void tst_WaylandCompositor::sendsIviConfigure()
     {
     public:
         MockIviSurface(::ivi_surface *iviSurface) : QtWayland::ivi_surface(iviSurface) {}
-        void ivi_surface_configure(int32_t width, int32_t height) Q_DECL_OVERRIDE
+        void ivi_surface_configure(int32_t width, int32_t height) override
         {
             configureSize = QSize(width, height);
         }
diff --git a/tests/manual/subsurface/shmwindow.h b/tests/manual/subsurface/shmwindow.h
index 451f5fc4a..44d111e79 100644
--- a/tests/manual/subsurface/shmwindow.h
+++ b/tests/manual/subsurface/shmwindow.h
@@ -50,8 +50,8 @@ public:
     explicit ShmWindow(QWindow *parent);
 
 protected:
-    void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
-    void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+    void paintEvent(QPaintEvent *event) override;
+    void timerEvent(QTimerEvent *) override;
 
 private:
     int m_rotation;