Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	.qmake.conf
	examples/wayland/custom-extension/client-common/main.cpp
	src/client/qwaylandwlshellintegration_p.h
	src/client/qwaylandxdgshellintegration_p.h
	src/compositor/compositor_api/qwaylandquickoutput.h
	src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h

Change-Id: Ic78c610ddf102b0a185294f625bbfcb9238b0f3c

3 files changed, 15 insertions, 15 deletions

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 f48bb8724..0c9c007a2 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;