From a60f91d1cebe41b7fdd96171fc19fa75662c6f66 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 2 Jul 2020 12:17:27 +0200 Subject: 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 --- examples/wayland/pure-qml/CMakeLists.txt | 2 +- examples/wayland/pure-qml/pure-qml.pro | 2 +- examples/wayland/pure-qml/pure-qml.qrc | 2 +- examples/wayland/pure-qml/qml/CompositorScreen.qml | 124 +++++++++++++++++++++ examples/wayland/pure-qml/qml/Screen.qml | 124 --------------------- examples/wayland/pure-qml/qml/main.qml | 2 +- 6 files changed, 128 insertions(+), 128 deletions(-) create mode 100644 examples/wayland/pure-qml/qml/CompositorScreen.qml delete mode 100644 examples/wayland/pure-qml/qml/Screen.qml (limited to 'examples') 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 @@ images/background.jpg qml/main.qml - qml/Screen.qml + qml/CompositorScreen.qml qml/Chrome.qml qml/Keyboard.qml diff --git a/examples/wayland/pure-qml/qml/CompositorScreen.qml b/examples/wayland/pure-qml/qml/CompositorScreen.qml new file mode 100644 index 000000000..b156cb434 --- /dev/null +++ b/examples/wayland/pure-qml/qml/CompositorScreen.qml @@ -0,0 +1,124 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.5 +import QtQuick.Window 2.2 +import QtWayland.Compositor 1.0 + +WaylandOutput { + id: output + + property ListModel shellSurfaces: ListModel {} + property bool isNestedCompositor: Qt.platform.pluginName.startsWith("wayland") || Qt.platform.pluginName === "xcb" + + function handleShellSurface(shellSurface) { + shellSurfaces.append({shellSurface: shellSurface}); + } + + // During development, it can be useful to start the compositor inside X11 or + // another Wayland compositor. In such cases, set sizeFollowsWindow to true to + // enable resizing of the compositor window to be forwarded to the Wayland clients + // as the output (screen) changing resolution. Consider setting it to false if you + // are running the compositor using eglfs, linuxfb or similar QPA backends. + sizeFollowsWindow: output.isNestedCompositor + + window: Window { + width: 1024 + height: 760 + visible: true + + WaylandMouseTracker { + id: mouseTracker + + anchors.fill: parent + + // Set this to false to disable the outer mouse cursor when running nested + // compositors. Otherwise you would see two mouse cursors, one for each compositor. + windowSystemCursorEnabled: output.isNestedCompositor + + Image { + id: background + + anchors.fill: parent + fillMode: Image.Tile + source: "qrc:/images/background.jpg" + smooth: true + + Repeater { + model: output.shellSurfaces + // Chrome displays a shell surface on the screen (See Chrome.qml) + Chrome { + shellSurface: modelData + onDestroyAnimationFinished: output.shellSurfaces.remove(index) + } + } + } + + // Virtual Keyboard + Loader { + anchors.fill: parent + source: "Keyboard.qml" + } + + // Draws the mouse cursor for a given Wayland seat + WaylandCursorItem { + inputEventsEnabled: false + x: mouseTracker.mouseX + y: mouseTracker.mouseY + seat: output.compositor.defaultSeat + } + } + + Shortcut { + sequence: "Ctrl+Alt+Backspace" + onActivated: Qt.quit() + } + } +} diff --git a/examples/wayland/pure-qml/qml/Screen.qml b/examples/wayland/pure-qml/qml/Screen.qml deleted file mode 100644 index b156cb434..000000000 --- a/examples/wayland/pure-qml/qml/Screen.qml +++ /dev/null @@ -1,124 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.5 -import QtQuick.Window 2.2 -import QtWayland.Compositor 1.0 - -WaylandOutput { - id: output - - property ListModel shellSurfaces: ListModel {} - property bool isNestedCompositor: Qt.platform.pluginName.startsWith("wayland") || Qt.platform.pluginName === "xcb" - - function handleShellSurface(shellSurface) { - shellSurfaces.append({shellSurface: shellSurface}); - } - - // During development, it can be useful to start the compositor inside X11 or - // another Wayland compositor. In such cases, set sizeFollowsWindow to true to - // enable resizing of the compositor window to be forwarded to the Wayland clients - // as the output (screen) changing resolution. Consider setting it to false if you - // are running the compositor using eglfs, linuxfb or similar QPA backends. - sizeFollowsWindow: output.isNestedCompositor - - window: Window { - width: 1024 - height: 760 - visible: true - - WaylandMouseTracker { - id: mouseTracker - - anchors.fill: parent - - // Set this to false to disable the outer mouse cursor when running nested - // compositors. Otherwise you would see two mouse cursors, one for each compositor. - windowSystemCursorEnabled: output.isNestedCompositor - - Image { - id: background - - anchors.fill: parent - fillMode: Image.Tile - source: "qrc:/images/background.jpg" - smooth: true - - Repeater { - model: output.shellSurfaces - // Chrome displays a shell surface on the screen (See Chrome.qml) - Chrome { - shellSurface: modelData - onDestroyAnimationFinished: output.shellSurfaces.remove(index) - } - } - } - - // Virtual Keyboard - Loader { - anchors.fill: parent - source: "Keyboard.qml" - } - - // Draws the mouse cursor for a given Wayland seat - WaylandCursorItem { - inputEventsEnabled: false - x: mouseTracker.mouseX - y: mouseTracker.mouseY - seat: output.compositor.defaultSeat - } - } - - Shortcut { - sequence: "Ctrl+Alt+Backspace" - onActivated: Qt.quit() - } - } -} 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. -- cgit v1.2.3