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 | |
| 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')
| -rw-r--r-- | examples/wayland/multi-screen/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/wayland/multi-screen/multi-screen.pro | 2 | ||||
| -rw-r--r-- | examples/wayland/multi-screen/multi-screen.qrc | 2 | ||||
| -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 |
5 files changed, 4 insertions, 4 deletions
diff --git a/examples/wayland/multi-screen/CMakeLists.txt b/examples/wayland/multi-screen/CMakeLists.txt index a55582a53..d654e3003 100644 --- a/examples/wayland/multi-screen/CMakeLists.txt +++ b/examples/wayland/multi-screen/CMakeLists.txt @@ -32,7 +32,7 @@ target_link_libraries(multi-screen PUBLIC # Resources: set(multi-screen_resource_files "qml/Chrome.qml" - "qml/Screen.qml" + "qml/CompositorScreen.qml" "qml/main.qml" ) diff --git a/examples/wayland/multi-screen/multi-screen.pro b/examples/wayland/multi-screen/multi-screen.pro index 29e1479da..77f8258a5 100644 --- a/examples/wayland/multi-screen/multi-screen.pro +++ b/examples/wayland/multi-screen/multi-screen.pro @@ -14,5 +14,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/wayland/multi-screen INSTALLS += target sources DISTFILES += \ - qml/Screen.qml \ + qml/CompositorScreen.qml \ qml/Chrome.qml diff --git a/examples/wayland/multi-screen/multi-screen.qrc b/examples/wayland/multi-screen/multi-screen.qrc index 57fcd3cf6..a24e3efd5 100644 --- a/examples/wayland/multi-screen/multi-screen.qrc +++ b/examples/wayland/multi-screen/multi-screen.qrc @@ -1,7 +1,7 @@ <RCC> <qresource prefix="/"> <file>qml/main.qml</file> - <file>qml/Screen.qml</file> + <file>qml/CompositorScreen.qml</file> <file>qml/Chrome.qml</file> </qresource> </RCC> 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 |