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

Change-Id: Ica38060e6d624a7534660eabec604f6795970c95

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration.cpp b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration.cpp
index d032002b1..12cc95b15 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration.cpp
+++ b/src/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);
 }