diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-07-02 12:17:27 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-07-06 08:22:39 +0200 |
| commit | a60f91d1cebe41b7fdd96171fc19fa75662c6f66 (patch) | |
| tree | 6b11486229e11b2dfb73369af6a620dc88dc6bed /examples/wayland | |
| parent | 057c86e6d0be1bf7a48b8b2f7f58f02f2952016f (diff) | |
pure-qml: Rename Screen to CompositorScreen
After Window moved into Qt Quick, the Screen attached
property is now available even without import QtQuick.Window.
This causes conflicts with local types called Screen.
Task-number: QTBUG-85199
Change-Id: I989e66a8111c0a23996902d9678bc85f238df288
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'examples/wayland')
| -rw-r--r-- | examples/wayland/pure-qml/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/wayland/pure-qml/pure-qml.pro | 2 | ||||
| -rw-r--r-- | examples/wayland/pure-qml/pure-qml.qrc | 2 | ||||
| -rw-r--r-- | examples/wayland/pure-qml/qml/CompositorScreen.qml (renamed from examples/wayland/pure-qml/qml/Screen.qml) | 0 | ||||
| -rw-r--r-- | examples/wayland/pure-qml/qml/main.qml | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/examples/wayland/pure-qml/CMakeLists.txt b/examples/wayland/pure-qml/CMakeLists.txt index c317f70bf..cf17c5bb8 100644 --- a/examples/wayland/pure-qml/CMakeLists.txt +++ b/examples/wayland/pure-qml/CMakeLists.txt @@ -33,8 +33,8 @@ target_link_libraries(pure-qml PUBLIC set(pure-qml_resource_files "images/background.jpg" "qml/Chrome.qml" + "qml/CompositorScreen.qml" "qml/Keyboard.qml" - "qml/Screen.qml" "qml/main.qml" ) diff --git a/examples/wayland/pure-qml/pure-qml.pro b/examples/wayland/pure-qml/pure-qml.pro index 20fc529ed..2214922e8 100644 --- a/examples/wayland/pure-qml/pure-qml.pro +++ b/examples/wayland/pure-qml/pure-qml.pro @@ -5,7 +5,7 @@ SOURCES += \ OTHER_FILES = \ qml/main.qml \ - qml/Screen.qml \ + qml/CompositorScreen.qml \ qml/Chrome.qml \ qml/Keyboard.qml \ images/background.jpg \ diff --git a/examples/wayland/pure-qml/pure-qml.qrc b/examples/wayland/pure-qml/pure-qml.qrc index 8c95434d3..145b3f250 100644 --- a/examples/wayland/pure-qml/pure-qml.qrc +++ b/examples/wayland/pure-qml/pure-qml.qrc @@ -2,7 +2,7 @@ <qresource prefix="/"> <file>images/background.jpg</file> <file>qml/main.qml</file> - <file>qml/Screen.qml</file> + <file>qml/CompositorScreen.qml</file> <file>qml/Chrome.qml</file> <file>qml/Keyboard.qml</file> </qresource> diff --git a/examples/wayland/pure-qml/qml/Screen.qml b/examples/wayland/pure-qml/qml/CompositorScreen.qml index b156cb434..b156cb434 100644 --- a/examples/wayland/pure-qml/qml/Screen.qml +++ b/examples/wayland/pure-qml/qml/CompositorScreen.qml diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml index 483de7514..391dbed43 100644 --- a/examples/wayland/pure-qml/qml/main.qml +++ b/examples/wayland/pure-qml/qml/main.qml @@ -54,7 +54,7 @@ import QtWayland.Compositor 1.3 WaylandCompositor { id: waylandCompositor - Screen { id: screen; compositor: waylandCompositor } + CompositorScreen { id: screen; compositor: waylandCompositor } // Shell surface extension. Needed to provide a window concept for Wayland clients. // I.e. requests and events for maximization, minimization, resizing, closing etc. |