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/pure-qml/pure-qml.pro | |
| 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/pure-qml/pure-qml.pro')
| -rw-r--r-- | examples/wayland/pure-qml/pure-qml.pro | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ |