Compositor: Change default of autoCreatePopupItems to true

Already ifdef'ed to true, but we can now update the examples.

[ChangeLog][Compositor] ShellSurfaceItem.autoCreatePopupItems
now defaults to true.

Task-number: QTBUG-68843
Change-Id: I9d7625e710c5c27b664678b459c09121b445fffc
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

8 files changed, 1 insertions, 16 deletions

diff --git a/examples/wayland/minimal-qml/main.qml b/examples/wayland/minimal-qml/main.qml
index 63ed9da5f..61cb6c9ef 100644
--- a/examples/wayland/minimal-qml/main.qml
+++ b/examples/wayland/minimal-qml/main.qml
@@ -67,7 +67,6 @@ WaylandCompositor {
                 // resize/move, and forwarding of mouse and keyboard
                 // events to the client process.
                 ShellSurfaceItem {
-                    autoCreatePopupItems: true
                     shellSurface: modelData
                     onSurfaceDestroyed: shellSurfaces.remove(index)
                 }
diff --git a/examples/wayland/multi-screen/qml/Chrome.qml b/examples/wayland/multi-screen/qml/Chrome.qml
index 52f449468..99141ad25 100644
--- a/examples/wayland/multi-screen/qml/Chrome.qml
+++ b/examples/wayland/multi-screen/qml/Chrome.qml
@@ -63,7 +63,6 @@ Item {
 
     ShellSurfaceItem {
         id: surfaceItem
-        autoCreatePopupItems: true
         onSurfaceDestroyed: chrome.destroy();
     }
 
diff --git a/examples/wayland/overview-compositor/main.qml b/examples/wayland/overview-compositor/main.qml
index 95eb80878..3785a7ed0 100644
--- a/examples/wayland/overview-compositor/main.qml
+++ b/examples/wayland/overview-compositor/main.qml
@@ -99,7 +99,6 @@ WaylandCompositor {
                         ShellSurfaceItem {
                             anchors.fill: parent
                             shellSurface: xdgSurface
-                            autoCreatePopupItems: true
                             onSurfaceDestroyed: toplevels.remove(index)
                         }
                         MouseArea {
diff --git a/examples/wayland/pure-qml/qml/Chrome.qml b/examples/wayland/pure-qml/qml/Chrome.qml
index a63ee705c..6e3270961 100644
--- a/examples/wayland/pure-qml/qml/Chrome.qml
+++ b/examples/wayland/pure-qml/qml/Chrome.qml
@@ -58,9 +58,6 @@ ShellSurfaceItem {
 
     signal destroyAnimationFinished
 
-    // If the client asks to show popups on this surface, automatically create child ShellSurfaceItems
-    autoCreatePopupItems: true
-
     onSurfaceDestroyed: {
         bufferLocked = true;
         destroyAnimation.start();
diff --git a/examples/wayland/server-side-decoration/main.qml b/examples/wayland/server-side-decoration/main.qml
index 5847ce411..4639ddcfd 100644
--- a/examples/wayland/server-side-decoration/main.qml
+++ b/examples/wayland/server-side-decoration/main.qml
@@ -96,7 +96,6 @@ WaylandCompositor {
                     ShellSurfaceItem {
                         id: shellSurfaceItem
                         moveItem: parent
-                        autoCreatePopupItems: true
                         shellSurface: modelData
                         onSurfaceDestroyed: shellSurfaces.remove(index)
                     }
diff --git a/examples/wayland/spanning-screens/main.qml b/examples/wayland/spanning-screens/main.qml
index ab57306bb..a5abc9b01 100644
--- a/examples/wayland/spanning-screens/main.qml
+++ b/examples/wayland/spanning-screens/main.qml
@@ -100,7 +100,6 @@ WaylandCompositor {
     Component {
         id: chromeComponent
         ShellSurfaceItem {
-            autoCreatePopupItems: true
             onSurfaceDestroyed: destroy()
         }
     }
diff --git a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml b/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
index 16a412fcd..6a0b90c88 100644
--- a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
+++ b/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
@@ -95,7 +95,6 @@ WaylandCompositor {
             Repeater {
                 model: shellSurfaces
                 ShellSurfaceItem {
-                    autoCreatePopupItems: true
                     shellSurface: modelData
                     onSurfaceDestroyed: shellSurfaces.remove(index)
                 }
diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
index f622368ab..02fbf696f 100644
--- a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
+++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
@@ -74,13 +74,7 @@ public:
     QWaylandQuickShellIntegration *m_shellIntegration = nullptr;
     QWaylandShellSurface *m_shellSurface = nullptr;
     QQuickItem *m_moveItem = nullptr;
-    bool m_autoCreatePopupItems =
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-            true;
-#else
-            false;
-#endif
-
+    bool m_autoCreatePopupItems = true;
 };
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickShellEventFilter : public QObject