summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/wayland/multi-output/qml/GridScreen.qml10
-rw-r--r--examples/wayland/multi-output/qml/ShellScreen.qml10
-rw-r--r--examples/wayland/multi-output/qml/main.qml4
3 files changed, 21 insertions, 3 deletions
diff --git a/examples/wayland/multi-output/qml/GridScreen.qml b/examples/wayland/multi-output/qml/GridScreen.qml
index 340291afd..a59cb8fb4 100644
--- a/examples/wayland/multi-output/qml/GridScreen.qml
+++ b/examples/wayland/multi-output/qml/GridScreen.qml
@@ -50,7 +50,7 @@
import QtQuick 2.0
import QtQuick.Window 2.2
-import QtWayland.Compositor 1.0
+import QtWayland.Compositor 1.14
WaylandOutput {
id: output
@@ -93,4 +93,12 @@ WaylandOutput {
}
}
}
+
+ XdgOutputV1 {
+ name: "WL-2"
+ description: "Overview screen"
+ logicalPosition: output.position
+ logicalSize: Qt.size(output.geometry.width / output.scaleFactor,
+ output.geometry.height / output.scaleFactor)
+ }
}
diff --git a/examples/wayland/multi-output/qml/ShellScreen.qml b/examples/wayland/multi-output/qml/ShellScreen.qml
index 4482e6e85..aa9b4b29b 100644
--- a/examples/wayland/multi-output/qml/ShellScreen.qml
+++ b/examples/wayland/multi-output/qml/ShellScreen.qml
@@ -50,7 +50,7 @@
import QtQuick 2.0
import QtQuick.Window 2.2
-import QtWayland.Compositor 1.0
+import QtWayland.Compositor 1.14
WaylandOutput {
id: output
@@ -84,4 +84,12 @@ WaylandOutput {
}
}
}
+
+ XdgOutputV1 {
+ name: "WL-1"
+ description: "Screen with window management"
+ logicalPosition: output.position
+ logicalSize: Qt.size(output.geometry.width / output.scaleFactor,
+ output.geometry.height / output.scaleFactor)
+ }
}
diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml
index d01def55e..45f91fd66 100644
--- a/examples/wayland/multi-output/qml/main.qml
+++ b/examples/wayland/multi-output/qml/main.qml
@@ -49,7 +49,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtWayland.Compositor 1.0
+import QtWayland.Compositor 1.14
WaylandCompositor {
id: comp
@@ -91,6 +91,8 @@ WaylandCompositor {
}
}
+ XdgOutputManagerV1 {}
+
WlShell {
id: defaultShell