4 files changed, 17 insertions, 0 deletions
diff --git a/src/client/qwaylandshellsurface_p.h b/src/client/qwaylandshellsurface_p.h
index 6499a2bb0..8632efd04 100644
--- a/src/client/qwaylandshellsurface_p.h
+++ b/src/client/qwaylandshellsurface_p.h
@@ -70,6 +70,7 @@ public:
     virtual void setWindowPosition(const QPoint &position) { Q_UNUSED(position); }
 
     virtual bool requestActivate() { return false; }
+    virtual bool requestActivateOnShow() { return false; }
     virtual void setXdgActivationToken(const QString &token);
     virtual void requestXdgActivationToken(quint32 serial);
 
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 7fc9f398b..081110f83 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -576,6 +576,9 @@ void QWaylandWindow::setVisible(bool visible)
         // Don't flush the events here, or else the newly visible window may start drawing, but since
         // there was no frame before it will be stuck at the waitForFrameSync() in
         // QWaylandShmBackingStore::beginPaint().
+
+        if (mShellSurface)
+            mShellSurface->requestActivateOnShow();
     } else {
         sendExposeEvent(QRect());
         reset();
diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
index d65d4e722..c7b95e0d0 100644
--- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
+++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
@@ -662,6 +662,18 @@ bool QWaylandXdgSurface::requestActivate()
     return false;
 }
 
+bool QWaylandXdgSurface::requestActivateOnShow()
+{
+    const Qt::WindowType type = m_window->window()->type();
+    if (type == Qt::ToolTip || type == Qt::Popup || type == Qt::SplashScreen)
+        return false;
+
+    if (m_window->window()->property("_q_showWithoutActivating").toBool())
+        return false;
+
+    return requestActivate();
+}
+
 void QWaylandXdgSurface::requestXdgActivationToken(quint32 serial)
 {
     if (auto *activation = m_shell->activation()) {
diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
index 22a207a25..fa33259f7 100644
--- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
+++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h
@@ -64,6 +64,7 @@ public:
     void propagateSizeHints() override;
     void setWindowGeometry(const QRect &rect) override;
     bool requestActivate() override;
+    bool requestActivateOnShow() override;
     void setXdgActivationToken(const QString &token) override;
     void requestXdgActivationToken(quint32 serial) override;
     void setAlertState(bool enabled) override;