diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-07-06 11:45:14 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-07-09 13:00:09 +0200 |
| commit | 4f422bcb445123562c8b07e69b07b474cba58254 (patch) | |
| tree | 28a216e35edd604439bd3c5f73e2a8f7f2436b94 /examples/wayland/multi-screen/qml | |
| parent | 5948edb37237c11804bf6a7a1226134167ac47af (diff) | |
Move Screen -> CompositorScreen in examples
We no longer support using types called Screen when QtQuick
is imported.
This also cleans up a couple of copy-paste errors, where
Screen.qml is referenced from the .pro file without actually
existing in the example.
Task-number: QTBUG-85199
Change-Id: I7f456aabacaf6165d38fbe4bf951baf6d3dab9a6
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'examples/wayland/multi-screen/qml')
| -rw-r--r-- | examples/wayland/multi-screen/qml/CompositorScreen.qml (renamed from examples/wayland/multi-screen/qml/Screen.qml) | 0 | ||||
| -rw-r--r-- | examples/wayland/multi-screen/qml/main.qml | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/examples/wayland/multi-screen/qml/Screen.qml b/examples/wayland/multi-screen/qml/CompositorScreen.qml index 9e4d5b681..9e4d5b681 100644 --- a/examples/wayland/multi-screen/qml/Screen.qml +++ b/examples/wayland/multi-screen/qml/CompositorScreen.qml diff --git a/examples/wayland/multi-screen/qml/main.qml b/examples/wayland/multi-screen/qml/main.qml index 0ef75fbce..ed1501998 100644 --- a/examples/wayland/multi-screen/qml/main.qml +++ b/examples/wayland/multi-screen/qml/main.qml @@ -71,7 +71,7 @@ WaylandCompositor { id: screens model: emulated ? emulatedScreens : Qt.application.screens - delegate: Screen { + delegate: CompositorScreen { surfaceArea.color: "lightsteelblue" text: name compositor: comp |