summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-08-07 14:20:19 +0200
committerJohan Helsing <johan.helsing@qt.io>2018-08-07 14:52:58 +0000
commit97e497acec22e51af58cc13ae1dd77be5b23071d (patch)
tree9e37d769cc9989b937175d853da95f8fd49e0761 /examples
parentd79f7c12db1a21097ab1bf7e2cf87e7b88b1ae9f (diff)
Multi-screen example compositor: Upgrade to xdg-shell unstable v6
Change-Id: Ifdee719cd79516a36ba9282abac9c59afacf542f Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/wayland/multi-screen/qml/Chrome.qml1
-rw-r--r--examples/wayland/multi-screen/qml/main.qml7
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/wayland/multi-screen/qml/Chrome.qml b/examples/wayland/multi-screen/qml/Chrome.qml
index 99141ad25..52f449468 100644
--- a/examples/wayland/multi-screen/qml/Chrome.qml
+++ b/examples/wayland/multi-screen/qml/Chrome.qml
@@ -63,6 +63,7 @@ Item {
ShellSurfaceItem {
id: surfaceItem
+ autoCreatePopupItems: true
onSurfaceDestroyed: chrome.destroy();
}
diff --git a/examples/wayland/multi-screen/qml/main.qml b/examples/wayland/multi-screen/qml/main.qml
index 9b97c95b9..354dd1c91 100644
--- a/examples/wayland/multi-screen/qml/main.qml
+++ b/examples/wayland/multi-screen/qml/main.qml
@@ -52,7 +52,7 @@
import QtQml 2.2
import QtQuick 2.0
import QtQuick.Window 2.3 as Window
-import QtWayland.Compositor 1.0
+import QtWayland.Compositor 1.1
import QtQml.Models 2.1
WaylandCompositor {
@@ -100,9 +100,8 @@ WaylandCompositor {
onWlShellSurfaceCreated: handleShellSurfaceCreated(shellSurface)
}
- XdgShellV5 {
- onXdgSurfaceCreated: handleShellSurfaceCreated(xdgSurface)
- onXdgPopupCreated: handleShellSurfaceCreated(xdgPopup)
+ XdgShellV6 {
+ onToplevelCreated: handleShellSurfaceCreated(xdgSurface)
}
function createShellSurfaceItem(shellSurface, moveItem, output) {