summaryrefslogtreecommitdiff
path: root/examples/wayland
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@qt.io>2020-07-08 10:31:22 +0200
committerPaul Olav Tvete <paul.tvete@qt.io>2020-09-23 09:41:42 +0200
commit3a8449ff0a821ab072f66ea43fed6925090fc4d8 (patch)
treef11002ac77af84796111138d6d58ccd42c3f5e5f /examples/wayland
parent6d2ed22188af2966f699f265093db3f0bf59d135 (diff)
downloadqtwayland-3a8449ff0a821ab072f66ea43fed6925090fc4d8.tar.gz
Add iviShell support to example compositors
Now that XdgShellV6 is removed, some older Wayland applications (such as weston-terminal and weston-simple-egl in Ubuntu 18.04) would assert when run against our example compositors. Adding IviApplications let them run (although with reduced functionality). Change-Id: If28513f23d4cb362608119db8233eb2e47f794bb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'examples/wayland')
-rw-r--r--examples/wayland/hwlayer-compositor/main.qml1
-rw-r--r--examples/wayland/minimal-qml/main.qml5
-rw-r--r--examples/wayland/pure-qml/qml/main.qml5
3 files changed, 11 insertions, 0 deletions
diff --git a/examples/wayland/hwlayer-compositor/main.qml b/examples/wayland/hwlayer-compositor/main.qml
index 584c0c35..aaea5b79 100644
--- a/examples/wayland/hwlayer-compositor/main.qml
+++ b/examples/wayland/hwlayer-compositor/main.qml
@@ -158,5 +158,6 @@ WaylandCompositor {
shellSurfaces.append({shSurface: shellSurface, animatePosition: false, animateOpacity: false, level: 0});
}
XdgShell { onToplevelCreated: addShellSurface(xdgSurface) }
+ IviApplication { onIviSurfaceCreated: addShellSurface(iviSurface) }
WlShell { onWlShellSurfaceCreated: addShellSurface(shellSurface) }
}
diff --git a/examples/wayland/minimal-qml/main.qml b/examples/wayland/minimal-qml/main.qml
index a4e6d89f..a7709e09 100644
--- a/examples/wayland/minimal-qml/main.qml
+++ b/examples/wayland/minimal-qml/main.qml
@@ -88,5 +88,10 @@ WaylandCompositor {
onToplevelCreated:
shellSurfaces.append({shellSurface: xdgSurface});
}
+ IviApplication {
+ onIviSurfaceCreated: {
+ shellSurfaces.append({shellSurface: iviSurface});
+ }
+ }
ListModel { id: shellSurfaces }
}
diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index 5a21735b..eb4ae9ac 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -64,6 +64,11 @@ WaylandCompositor {
onToplevelCreated: screen.handleShellSurface(xdgSurface)
}
+ // Minimalistic shell extension. Mainly used for embedded applications.
+ IviApplication {
+ onIviSurfaceCreated: screen.handleShellSurface(iviSurface)
+ }
+
// Deprecated shell extension, still used by some clients
WlShell {
onWlShellSurfaceCreated: screen.handleShellSurface(shellSurface)