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>

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 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
     }
 
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
diff --git a/examples/wayland/server-buffer/compositor/compositor.pro b/examples/wayland/server-buffer/compositor/compositor.pro
index 8ff20ad2e..26334c63c 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 c8497970e..098034f3b 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