Merge dev into 5.9

Change-Id: I560f73aa89f2b833a405861bef510aad8fbd9a07

1 files changed, 8 insertions, 8 deletions

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;