From e9fb11653a504b86478ef8f4513a6c23045a4fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 8 Feb 2017 16:40:47 +0100 Subject: Update examples to account for Window.targetScreen rename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I97af04c43a5966472eb195779ffd730b7459aa37 Reviewed-by: Tor Arne Vestbø --- examples/wayland/multi-screen/qml/Screen.qml | 6 +++--- examples/wayland/multi-screen/qml/main.qml | 2 +- examples/wayland/spanning-screens/main.qml | 4 ++-- 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 26132f754..2179e4779 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 25961c698..9eaf6ffbb 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 ae6815c9d..ef3e70ac9 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] } } -- cgit v1.2.3