Move XdgShell types into their own import

We want extensions to be accessible from submodules to
QtWayland.Compositor, since this makes it easier to
deprecate and remove things as they become outdated.

[ChangeLog][XdgShell] Moved XdgShell types from QML
import QtWayland.Compositor to QtWayland.Compositor.XdgShell.

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

12 files changed, 12 insertions, 0 deletions

diff --git a/examples/wayland/hwlayer-compositor/main.qml b/examples/wayland/hwlayer-compositor/main.qml
index 734782346..c13223aa6 100644
--- a/examples/wayland/hwlayer-compositor/main.qml
+++ b/examples/wayland/hwlayer-compositor/main.qml
@@ -52,6 +52,7 @@ import QtQuick
 import QtQuick.Window
 import QtQuick.Controls 2.2
 import QtWayland.Compositor
+import QtWayland.Compositor.XdgShell
 
 WaylandCompositor {
     WaylandOutput {
diff --git a/examples/wayland/minimal-qml/main.qml b/examples/wayland/minimal-qml/main.qml
index f44d6b49b..6a802217c 100644
--- a/examples/wayland/minimal-qml/main.qml
+++ b/examples/wayland/minimal-qml/main.qml
@@ -51,6 +51,7 @@
 import QtQuick
 import QtQuick.Window
 import QtWayland.Compositor
+import QtWayland.Compositor.XdgShell
 
 WaylandCompositor {
     // The output defines the screen.
diff --git a/examples/wayland/multi-output/qml/GridScreen.qml b/examples/wayland/multi-output/qml/GridScreen.qml
index 1f690b7c1..372667f1f 100644
--- a/examples/wayland/multi-output/qml/GridScreen.qml
+++ b/examples/wayland/multi-output/qml/GridScreen.qml
@@ -51,6 +51,7 @@
 import QtQuick
 import QtQuick.Window
 import QtWayland.Compositor
+import QtWayland.Compositor.XdgShell
 
 WaylandOutput {
     id: output
diff --git a/examples/wayland/multi-output/qml/ShellScreen.qml b/examples/wayland/multi-output/qml/ShellScreen.qml
index 4b3684fde..92d734c86 100644
--- a/examples/wayland/multi-output/qml/ShellScreen.qml
+++ b/examples/wayland/multi-output/qml/ShellScreen.qml
@@ -51,6 +51,7 @@
 import QtQuick
 import QtQuick.Window
 import QtWayland.Compositor
+import QtWayland.Compositor.XdgShell
 
 WaylandOutput {
     id: output
diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml
index efced875d..eb5d15895 100644
--- a/examples/wayland/multi-output/qml/main.qml
+++ b/examples/wayland/multi-output/qml/main.qml
@@ -50,6 +50,7 @@
 
 import QtQuick
 import QtWayland.Compositor
+import QtWayland.Compositor.XdgShell
 
 WaylandCompositor {
     id: comp
diff --git a/examples/wayland/multi-screen/qml/main.qml b/examples/wayland/multi-screen/qml/main.qml
index ed1501998..6d3606d04 100644
--- a/examples/wayland/multi-screen/qml/main.qml
+++ b/examples/wayland/multi-screen/qml/main.qml
@@ -53,6 +53,7 @@ import QtQml
 import QtQuick
 import QtQuick.Window as Window
 import QtWayland.Compositor
+import QtWayland.Compositor.XdgShell
 import QtQml.Models
 
 WaylandCompositor {
diff --git a/examples/wayland/overview-compositor/main.qml b/examples/wayland/overview-compositor/main.qml
index b5f671f61..d44d3e2df 100644
--- a/examples/wayland/overview-compositor/main.qml
+++ b/examples/wayland/overview-compositor/main.qml
@@ -50,6 +50,7 @@
 
 import QtQuick
 import QtWayland.Compositor
+import QtWayland.Compositor.XdgShell
 import QtQuick.Window
 import QtQuick.Controls 2.0
 
diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index 097ee9b13..eb4ccfc11 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -50,6 +50,7 @@
 
 import QtQuick
 import QtWayland.Compositor
+import QtWayland.Compositor.XdgShell
 
 WaylandCompositor {
     id: waylandCompositor
diff --git a/examples/wayland/server-side-decoration/main.qml b/examples/wayland/server-side-decoration/main.qml
index d93d7689c..7974f3c7d 100644
--- a/examples/wayland/server-side-decoration/main.qml
+++ b/examples/wayland/server-side-decoration/main.qml
@@ -52,6 +52,7 @@ import QtQuick
 import QtQuick.Window
 import QtQuick.Layouts
 import QtWayland.Compositor
+import QtWayland.Compositor.XdgShell
 
 WaylandCompositor {
     // The output defines the screen.
diff --git a/examples/wayland/spanning-screens/main.qml b/examples/wayland/spanning-screens/main.qml
index b3788dbc0..a13ab4652 100644
--- a/examples/wayland/spanning-screens/main.qml
+++ b/examples/wayland/spanning-screens/main.qml
@@ -51,6 +51,7 @@
 import QtQuick
 import QtQuick.Window
 import QtWayland.Compositor
+import QtWayland.Compositor.XdgShell
 
 WaylandCompositor {
     WaylandOutput {
diff --git a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml b/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
index 6e1348140..5958ceb51 100644
--- a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
+++ b/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
@@ -51,6 +51,7 @@
 import QtQuick
 import QtQuick.Window
 import QtWayland.Compositor
+import QtWayland.Compositor.XdgShell
 
 import com.theqtcompany.customsharingextension
 
diff --git a/examples/wayland/texture-sharing/minimal-compositor.qml b/examples/wayland/texture-sharing/minimal-compositor.qml
index ba89afd62..b3a32e05c 100644
--- a/examples/wayland/texture-sharing/minimal-compositor.qml
+++ b/examples/wayland/texture-sharing/minimal-compositor.qml
@@ -51,6 +51,7 @@
 import QtQuick
 import QtQuick.Window
 import QtWayland.Compositor
+import QtWayland.Compositor.XdgShell
 
 // importing the texture sharing extension:
 import QtWayland.Compositor.TextureSharingExtension