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/custom-extension | |
| 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/custom-extension')
| -rw-r--r-- | examples/wayland/custom-extension/compositor/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/wayland/custom-extension/compositor/compositor.pro | 2 | ||||
| -rw-r--r-- | examples/wayland/custom-extension/compositor/compositor.qrc | 2 | ||||
| -rw-r--r-- | examples/wayland/custom-extension/compositor/qml/CompositorScreen.qml (renamed from examples/wayland/custom-extension/compositor/qml/Screen.qml) | 0 | ||||
| -rw-r--r-- | examples/wayland/custom-extension/compositor/qml/main.qml | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/examples/wayland/custom-extension/compositor/CMakeLists.txt b/examples/wayland/custom-extension/compositor/CMakeLists.txt index cf87ad5eb..d38efb1bf 100644 --- a/examples/wayland/custom-extension/compositor/CMakeLists.txt +++ b/examples/wayland/custom-extension/compositor/CMakeLists.txt @@ -40,7 +40,7 @@ target_link_libraries(custom-extension-compositor PUBLIC # Resources: set(compositor_resource_files "images/background.png" - "qml/Screen.qml" + "qml/CompositorScreen.qml" "qml/main.qml" ) diff --git a/examples/wayland/custom-extension/compositor/compositor.pro b/examples/wayland/custom-extension/compositor/compositor.pro index 6152e0a38..283ccdf4b 100644 --- a/examples/wayland/custom-extension/compositor/compositor.pro +++ b/examples/wayland/custom-extension/compositor/compositor.pro @@ -10,7 +10,7 @@ SOURCES += \ OTHER_FILES = \ qml/main.qml \ - qml/Screen.qml \ + qml/CompositorScreen.qml \ images/background.jpg WAYLANDSERVERSOURCES += \ diff --git a/examples/wayland/custom-extension/compositor/compositor.qrc b/examples/wayland/custom-extension/compositor/compositor.qrc index db3a8075a..6ab847a7c 100644 --- a/examples/wayland/custom-extension/compositor/compositor.qrc +++ b/examples/wayland/custom-extension/compositor/compositor.qrc @@ -2,6 +2,6 @@ <qresource prefix="/"> <file>images/background.png</file> <file>qml/main.qml</file> - <file>qml/Screen.qml</file> + <file>qml/CompositorScreen.qml</file> </qresource> </RCC> diff --git a/examples/wayland/custom-extension/compositor/qml/Screen.qml b/examples/wayland/custom-extension/compositor/qml/CompositorScreen.qml index 3d3deca58..3d3deca58 100644 --- a/examples/wayland/custom-extension/compositor/qml/Screen.qml +++ b/examples/wayland/custom-extension/compositor/qml/CompositorScreen.qml diff --git a/examples/wayland/custom-extension/compositor/qml/main.qml b/examples/wayland/custom-extension/compositor/qml/main.qml index ce9d764f7..92b8d63f4 100644 --- a/examples/wayland/custom-extension/compositor/qml/main.qml +++ b/examples/wayland/custom-extension/compositor/qml/main.qml @@ -67,7 +67,7 @@ WaylandCompositor { } } - Screen { + CompositorScreen { compositor: comp } |