From d636d86206f5b32667709bf9a7717460cc5b17a0 Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Date: Tue, 7 Jul 2020 09:56:41 +0200
Subject: Move WlShell types into their own import

We want extensions to be in submodules in QML.

[ChangeLog][WlShell] Moved WlShell types into QML import
QtWayland.Compositor.WlShell rather than QtWayland.Compositor

Task-number: QTBUG-68840
Change-Id: I7c3d2d05efdab86ea61affc6a9a0bc3e10835328
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
---
 examples/wayland/custom-extension/compositor/qml/main.qml       | 1 +
 examples/wayland/hwlayer-compositor/main.qml                    | 1 +
 examples/wayland/minimal-qml/main.qml                           | 1 +
 examples/wayland/multi-output/qml/main.qml                      | 1 +
 examples/wayland/multi-screen/qml/main.qml                      | 1 +
 examples/wayland/pure-qml/qml/main.qml                          | 1 +
 examples/wayland/server-buffer/compositor/qml/main.qml          | 1 +
 examples/wayland/texture-sharing/custom-compositor/qml/main.qml | 1 +
 examples/wayland/texture-sharing/minimal-compositor.qml         | 1 +
 9 files changed, 9 insertions(+)

(limited to 'examples')

diff --git a/examples/wayland/custom-extension/compositor/qml/main.qml b/examples/wayland/custom-extension/compositor/qml/main.qml
index 92b8d63f4..fcd7eba79 100644
--- a/examples/wayland/custom-extension/compositor/qml/main.qml
+++ b/examples/wayland/custom-extension/compositor/qml/main.qml
@@ -50,6 +50,7 @@
 
 import QtQuick
 import QtWayland.Compositor
+import QtWayland.Compositor.WlShell
 
 import com.theqtcompany.customextension 1.0
 
diff --git a/examples/wayland/hwlayer-compositor/main.qml b/examples/wayland/hwlayer-compositor/main.qml
index c13223aa6..584c0c353 100644
--- a/examples/wayland/hwlayer-compositor/main.qml
+++ b/examples/wayland/hwlayer-compositor/main.qml
@@ -53,6 +53,7 @@ import QtQuick.Window
 import QtQuick.Controls 2.2
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 
 WaylandCompositor {
     WaylandOutput {
diff --git a/examples/wayland/minimal-qml/main.qml b/examples/wayland/minimal-qml/main.qml
index 6a802217c..a4e6d89fc 100644
--- a/examples/wayland/minimal-qml/main.qml
+++ b/examples/wayland/minimal-qml/main.qml
@@ -52,6 +52,7 @@ import QtQuick
 import QtQuick.Window
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 
 WaylandCompositor {
     // The output defines the screen.
diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml
index eb5d15895..7632eb9cf 100644
--- a/examples/wayland/multi-output/qml/main.qml
+++ b/examples/wayland/multi-output/qml/main.qml
@@ -51,6 +51,7 @@
 import QtQuick
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 
 WaylandCompositor {
     id: comp
diff --git a/examples/wayland/multi-screen/qml/main.qml b/examples/wayland/multi-screen/qml/main.qml
index 6d3606d04..ab6d796bb 100644
--- a/examples/wayland/multi-screen/qml/main.qml
+++ b/examples/wayland/multi-screen/qml/main.qml
@@ -54,6 +54,7 @@ import QtQuick
 import QtQuick.Window as Window
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 import QtQml.Models
 
 WaylandCompositor {
diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index eb4ccfc11..448c5ff8f 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -51,6 +51,7 @@
 import QtQuick
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 
 WaylandCompositor {
     id: waylandCompositor
diff --git a/examples/wayland/server-buffer/compositor/qml/main.qml b/examples/wayland/server-buffer/compositor/qml/main.qml
index 907c20892..73b3fa8a4 100644
--- a/examples/wayland/server-buffer/compositor/qml/main.qml
+++ b/examples/wayland/server-buffer/compositor/qml/main.qml
@@ -50,6 +50,7 @@
 
 import QtQuick
 import QtWayland.Compositor
+import QtWayland.Compositor.WlShell
 import QtQuick.Window
 
 import com.theqtcompany.sharebufferextension
diff --git a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml b/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
index 5958ceb51..7a5705169 100644
--- a/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
+++ b/examples/wayland/texture-sharing/custom-compositor/qml/main.qml
@@ -52,6 +52,7 @@ import QtQuick
 import QtQuick.Window
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 
 import com.theqtcompany.customsharingextension
 
diff --git a/examples/wayland/texture-sharing/minimal-compositor.qml b/examples/wayland/texture-sharing/minimal-compositor.qml
index b3a32e05c..a832b051f 100644
--- a/examples/wayland/texture-sharing/minimal-compositor.qml
+++ b/examples/wayland/texture-sharing/minimal-compositor.qml
@@ -52,6 +52,7 @@ import QtQuick
 import QtQuick.Window
 import QtWayland.Compositor
 import QtWayland.Compositor.XdgShell
+import QtWayland.Compositor.WlShell
 
 // importing the texture sharing extension:
 import QtWayland.Compositor.TextureSharingExtension
-- 
cgit v1.2.3