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 | |
parent | 5948edb37237c11804bf6a7a1226134167ac47af (diff) | |
download | qtwayland-4f422bcb445123562c8b07e69b07b474cba58254.tar.gz |
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')
-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 | ||||
-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 | ||||
-rw-r--r-- | examples/wayland/server-buffer/compositor/compositor.pro | 1 | ||||
-rw-r--r-- | examples/wayland/texture-sharing/custom-compositor/custom-compositor.pro | 1 |
12 files changed, 8 insertions, 10 deletions
diff --git a/examples/wayland/custom-extension/compositor/CMakeLists.txt b/examples/wayland/custom-extension/compositor/CMakeLists.txt index cf87ad5e..d38efb1b 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 6152e0a3..283ccdf4 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 db3a8075..6ab847a7 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 3d3deca5..3d3deca5 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 ce9d764f..92b8d63f 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 } diff --git a/examples/wayland/multi-screen/CMakeLists.txt b/examples/wayland/multi-screen/CMakeLists.txt index a55582a5..d654e300 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 29e1479d..77f8258a 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 57fcd3cf..a24e3efd 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 9e4d5b68..9e4d5b68 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 0ef75fbc..ed150199 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 diff --git a/examples/wayland/server-buffer/compositor/compositor.pro b/examples/wayland/server-buffer/compositor/compositor.pro index 8ff20ad2..26334c63 100644 --- a/examples/wayland/server-buffer/compositor/compositor.pro +++ b/examples/wayland/server-buffer/compositor/compositor.pro @@ -10,7 +10,6 @@ SOURCES += \ OTHER_FILES = \ qml/main.qml \ - qml/Screen.qml \ images/background.jpg WAYLANDSERVERSOURCES += \ diff --git a/examples/wayland/texture-sharing/custom-compositor/custom-compositor.pro b/examples/wayland/texture-sharing/custom-compositor/custom-compositor.pro index c8497970..098034f3 100644 --- a/examples/wayland/texture-sharing/custom-compositor/custom-compositor.pro +++ b/examples/wayland/texture-sharing/custom-compositor/custom-compositor.pro @@ -7,7 +7,6 @@ SOURCES += \ OTHER_FILES = \ qml/main.qml \ - qml/Screen.qml \ images/background.jpg RESOURCES += compositor.qrc |