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

4 files changed, 8 insertions, 7 deletions

diff --git a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro
index baaf1698b..ba716c10d 100644
--- a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro
+++ b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro
@@ -1,6 +1,3 @@
-PLUGIN_TYPE = wayland-shell-integration
-load(qt_plugin)
-
 QT += gui-private waylandclient-private
 CONFIG += wayland-scanner
 
@@ -24,3 +21,7 @@ SOURCES += \
 
 OTHER_FILES += \
     ivi-shell.json
+
+PLUGIN_TYPE = wayland-shell-integration
+PLUGIN_CLASS_NAME = QWaylandIviShellIntegrationPlugin
+load(qt_plugin)
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 e332ce7f8..d7aa2a694 100644
--- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
+++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
@@ -60,8 +60,8 @@ public:
 
 private:
     void createExtendedSurface(QWaylandWindow *window);
-    virtual void ivi_surface_configure(int32_t width, int32_t height) Q_DECL_OVERRIDE;
-    void ivi_controller_surface_visibility(int32_t visibility) Q_DECL_OVERRIDE;
+    virtual void ivi_surface_configure(int32_t width, int32_t height) override;
+    void ivi_controller_surface_visibility(int32_t visibility) override;
 
     QWaylandWindow *m_window;
     QWaylandExtendedSurface *m_extendedWindow;