summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-02-08 16:40:47 +0100
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-02-11 15:51:21 +0000
commite9fb11653a504b86478ef8f4513a6c23045a4fa2 (patch)
tree983da1589e177ef9ab47bad7248bdedc6eb0b6c0
parentee58fc0edc94d18c2ab6d30f1836b23606ab2195 (diff)
Update examples to account for Window.targetScreen renamev5.9.0-alpha1
Change-Id: I97af04c43a5966472eb195779ffd730b7459aa37 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r--examples/wayland/multi-screen/qml/Screen.qml6
-rw-r--r--examples/wayland/multi-screen/qml/main.qml2
-rw-r--r--examples/wayland/spanning-screens/main.qml4
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/wayland/multi-screen/qml/Screen.qml b/examples/wayland/multi-screen/qml/Screen.qml
index 26132f75..2179e477 100644
--- a/examples/wayland/multi-screen/qml/Screen.qml
+++ b/examples/wayland/multi-screen/qml/Screen.qml
@@ -47,15 +47,15 @@ WaylandOutput {
property variant viewsBySurface: ({})
property alias surfaceArea: background
property alias text: t.text
- property alias targetScreen: win.targetScreen
+ property alias screen: win.screen
sizeFollowsWindow: true
property bool windowed: false
window: Window {
id: win
- x: targetScreen.virtualX
- y: targetScreen.virtualY
+ x: screen.virtualX
+ y: screen.virtualY
width: 800
height: 800
visibility: windowed ? Window.Windowed : Window.FullScreen
diff --git a/examples/wayland/multi-screen/qml/main.qml b/examples/wayland/multi-screen/qml/main.qml
index 25961c69..9eaf6ffb 100644
--- a/examples/wayland/multi-screen/qml/main.qml
+++ b/examples/wayland/multi-screen/qml/main.qml
@@ -65,7 +65,7 @@ WaylandCompositor {
surfaceArea.color: "lightsteelblue"
text: name
compositor: comp
- targetScreen: modelData
+ screen: modelData
Component.onCompleted: if (!comp.defaultOutput) comp.defaultOutput = this
position: Qt.point(virtualX, virtualY)
windowed: emulated
diff --git a/examples/wayland/spanning-screens/main.qml b/examples/wayland/spanning-screens/main.qml
index ae6815c9..ef3e70ac 100644
--- a/examples/wayland/spanning-screens/main.qml
+++ b/examples/wayland/spanning-screens/main.qml
@@ -59,7 +59,7 @@ WaylandCompositor {
// Enable the following to make the output target an actual screen,
// for example when running on eglfs in a multi-display embedded system.
- // targetScreen: Qt.application.screens[0]
+ // screen: Qt.application.screens[0]
}
}
@@ -77,7 +77,7 @@ WaylandCompositor {
// Enable the following to make the output target an actual screen,
// for example when running on eglfs in a multi-display embedded system.
- // targetScreen: Qt.application.screens[1]
+ // screen: Qt.application.screens[1]
}
}