1 files changed, 7 insertions, 10 deletions
diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
index 7a458381e..f622368ab 100644
--- a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
+++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
@@ -41,6 +41,7 @@
 #define QWAYLANDQUICKSHELLSURFACEITEM_P_H
 
 #include <QtWaylandCompositor/QWaylandQuickShellSurfaceItem>
+#include <QtWaylandCompositor/QWaylandQuickShellIntegration>
 #include <QtWaylandCompositor/private/qwaylandquickitem_p.h>
 #include <QtCore/QBasicTimer>
 
@@ -59,7 +60,6 @@ QT_BEGIN_NAMESPACE
 // We mean it.
 //
 
-class QWaylandQuickShellIntegration;
 class QWaylandShellSurface;
 class QWaylandQuickShellSurfaceItem;
 
@@ -74,16 +74,13 @@ public:
     QWaylandQuickShellIntegration *m_shellIntegration = nullptr;
     QWaylandShellSurface *m_shellSurface = nullptr;
     QQuickItem *m_moveItem = nullptr;
-    bool m_autoCreatePopupItems = false;
-};
+    bool m_autoCreatePopupItems =
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            true;
+#else
+            false;
+#endif
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickShellIntegration : public QObject
-{
-    Q_OBJECT
-public:
-    QWaylandQuickShellIntegration(QObject *parent = nullptr) : QObject(parent) {}
-    virtual bool mouseMoveEvent(QMouseEvent *) { return false; }
-    virtual bool mouseReleaseEvent(QMouseEvent *) { return false; }
 };
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickShellEventFilter : public QObject