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

Conflicts:
	src/compositor/compositor_api/qwaylandquickitem.cpp

Change-Id: I5e01a0731e880e3eb8eab349043756a5993e3050

src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/qwaylandwlshellintegration.cpp

@@ -49,10 +49,6 @@ namespace QtWaylandClient {
 
 bool QWaylandWlShellIntegration::initialize(QWaylandDisplay *display)
 {
-    qCWarning(lcQpaWayland) << "\"wl-shell\" is a deprecated shell extension, prefer using"
-                            << "\"xdg-shell-v6\" or \"xdg-shell\" if supported by the compositor"
-                            << "by setting the environment variable QT_WAYLAND_SHELL_INTEGRATION";
-
     Q_FOREACH (QWaylandDisplay::RegistryGlobal global, display->globals()) {
         if (global.interface == QLatin1String("wl_shell")) {
             m_wlShell = new QtWayland::wl_shell(display->wl_registry(), global.id, 1);
@@ -65,6 +61,10 @@ bool QWaylandWlShellIntegration::initialize(QWaylandDisplay *display)
         return false;
     }
 
+    qCWarning(lcQpaWayland) << "\"wl-shell\" is a deprecated shell extension, prefer using"
+                            << "\"xdg-shell-v6\" or \"xdg-shell\" if supported by the compositor"
+                            << "by setting the environment variable QT_WAYLAND_SHELL_INTEGRATION";
+
     return QWaylandShellIntegration::initialize(display);
 }
 

src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration.cpp

@@ -51,10 +51,6 @@ namespace QtWaylandClient {
 
 bool QWaylandXdgShellV5Integration::initialize(QWaylandDisplay *display)
 {
-    qCWarning(lcQpaWayland) << "\"xdg-shell-v5\" is a deprecated shell extension, prefer using"
-                            << "\"xdg-shell-v6\" or \"xdg-shell\" if supported by the compositor"
-                            << "by setting the environment variable QT_WAYLAND_SHELL_INTEGRATION";
-
     Q_FOREACH (QWaylandDisplay::RegistryGlobal global, display->globals()) {
         if (global.interface == QLatin1String("xdg_shell")) {
             m_xdgShell.reset(new QWaylandXdgShellV5(display->wl_registry(), global.id));
@@ -67,6 +63,10 @@ bool QWaylandXdgShellV5Integration::initialize(QWaylandDisplay *display)
         return false;
     }
 
+    qCWarning(lcQpaWayland) << "\"xdg-shell-v5\" is a deprecated shell extension, prefer using"
+                            << "\"xdg-shell-v6\" or \"xdg-shell\" if supported by the compositor"
+                            << "by setting the environment variable QT_WAYLAND_SHELL_INTEGRATION";
+
     return QWaylandShellIntegration::initialize(display);
 }
 

src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/qwaylandxdgshellv6.cpp

@@ -351,6 +351,7 @@ void QWaylandXdgSurfaceV6::zxdg_surface_v6_configure(uint32_t serial)
     if (!m_configured) {
         // We have to do the initial applyConfigure() immediately, since that is the expose.
         applyConfigure();
+        m_exposeRegion = QRegion(QRect(QPoint(), m_window->geometry().size()));
     } else {
         // Later configures are probably resizes, so we have to queue them up for a time when we
         // are not painting to the window.

src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp

@@ -385,6 +385,7 @@ void QWaylandXdgSurface::xdg_surface_configure(uint32_t serial)
     if (!m_configured) {
         // We have to do the initial applyConfigure() immediately, since that is the expose.
         applyConfigure();
+        m_exposeRegion = QRegion(QRect(QPoint(), m_window->geometry().size()));
     } else {
         // Later configures are probably resizes, so we have to queue them up for a time when we
         // are not painting to the window.

src/plugins/platforms/wayland/qwaylanddisplay_p.h

@@ -193,6 +193,11 @@ private:
     void requestWaylandSync();
 
     struct Listener {
+        Listener() = default;
+        Listener(RegistryListener incomingListener,
+                 void* incomingData)
+        : listener(incomingListener), data(incomingData)
+        {}
         RegistryListener listener = nullptr;
         void *data = nullptr;
     };

src/tools/qtwaylandscanner/qtwaylandscanner.cpp

@@ -40,6 +40,7 @@
 #include <QCoreApplication>
 #include <QFile>
 #include <QXmlStreamReader>
+#include <QtCore/QList>
 
 class Scanner
 {