diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-07-07 09:56:41 +0200 |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-07-09 13:00:29 +0200 |
commit | d636d86206f5b32667709bf9a7717460cc5b17a0 (patch) | |
tree | 7d1441108ba8226367fc1af2ff5f66c23c081f6d /examples | |
parent | 694d7eb289a258234bb9efa5dbb16778cbdfaf2c (diff) | |
download | qtwayland-d636d86206f5b32667709bf9a7717460cc5b17a0.tar.gz |
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')
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 92b8d63f..fcd7eba7 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 c13223aa..584c0c35 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 6a802217..a4e6d89f 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 eb5d1589..7632eb9c 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 6d3606d0..ab6d796b 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 eb4ccfc1..448c5ff8 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 907c2089..73b3fa8a 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 5958ceb5..7a570516 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 b3a32e05..a832b051 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 |