summaryrefslogtreecommitdiffstats
path: root/examples/wayland
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2020-07-07 09:56:41 +0200
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2020-07-09 13:00:29 +0200
commitd636d86206f5b32667709bf9a7717460cc5b17a0 (patch)
tree7d1441108ba8226367fc1af2ff5f66c23c081f6d /examples/wayland
parent694d7eb289a258234bb9efa5dbb16778cbdfaf2c (diff)
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>
Diffstat (limited to 'examples/wayland')
-rw-r--r--examples/wayland/custom-extension/compositor/qml/main.qml1
-rw-r--r--examples/wayland/hwlayer-compositor/main.qml1
-rw-r--r--examples/wayland/minimal-qml/main.qml1
-rw-r--r--examples/wayland/multi-output/qml/main.qml1
-rw-r--r--examples/wayland/multi-screen/qml/main.qml1
-rw-r--r--examples/wayland/pure-qml/qml/main.qml1
-rw-r--r--examples/wayland/server-buffer/compositor/qml/main.qml1
-rw-r--r--examples/wayland/texture-sharing/custom-compositor/qml/main.qml1
-rw-r--r--examples/wayland/texture-sharing/minimal-compositor.qml1
9 files changed, 9 insertions, 0 deletions
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