1 files changed, 38 insertions, 62 deletions

diff --git a/tests/manual/scaling-compositor/main.qml b/tests/manual/scaling-compositor/main.qml
index 056af4e5b..f173de3a0 100644
--- a/tests/manual/scaling-compositor/main.qml
+++ b/tests/manual/scaling-compositor/main.qml
@@ -1,57 +1,11 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** 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$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-import QtQuick 2.2
+import QtQuick 2.15
 import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
-import QtWayland.Compositor 1.0
+import QtWayland.Compositor 1.3
+import QtWayland.Compositor.WlShell
+import QtWayland.Compositor.XdgShell
 
 WaylandCompositor {
     id: comp
@@ -66,16 +20,7 @@ WaylandCompositor {
             height: 500
             visible: true
             title: "Scaling compositor x" + output.scaleFactor
-            Button {
-                id: incrementButton
-                text: "+"
-                onClicked: ++output.scaleFactor
-            }
-            Button {
-                text: "-"
-                onClicked: output.scaleFactor = Math.max(1, output.scaleFactor - 1)
-                anchors.left: incrementButton.right
-            }
+
             Repeater {
                 model: shellSurfaces
                 ShellSurfaceItem {
@@ -83,6 +28,33 @@ WaylandCompositor {
                     onSurfaceDestroyed: shellSurfaces.remove(index);
                 }
             }
+
+            Rectangle {
+                id: incrementButton
+                color: "#c0f0d0"
+                Text {
+                    text: "+"
+                }
+                width: 100
+                height: 30
+                TapHandler {
+                    onTapped: ++output.scaleFactor
+                }
+            }
+
+            Rectangle {
+                id: decrementButton
+                color: "#f0d0c0"
+                Text {
+                    text: "-"
+                }
+                width: 100
+                height: 30
+                TapHandler {
+                    onTapped: output.scaleFactor = Math.max(1, output.scaleFactor - 1)
+                }
+                anchors.left: incrementButton.right
+            }
         }
     }
 
@@ -91,4 +63,8 @@ WaylandCompositor {
     WlShell {
         onWlShellSurfaceCreated: shellSurfaces.append({shellSurface: shellSurface});
     }
+    XdgShell {
+        onToplevelCreated:
+            shellSurfaces.append({shellSurface: xdgSurface});
+    }
 }