1 files changed, 18 insertions, 42 deletions

diff --git a/tests/manual/qmldynamicdata/qml/qmldynamicdata/main.qml b/tests/manual/qmldynamicdata/qml/qmldynamicdata/main.qml
index a49a1184..1d0e65bf 100644
--- a/tests/manual/qmldynamicdata/qml/qmldynamicdata/main.qml
+++ b/tests/manual/qmldynamicdata/qml/qmldynamicdata/main.qml
@@ -1,37 +1,12 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Data Visualization module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-import QtQuick 2.1
-import QtDataVisualization 1.0
+import QtQuick
+import QtDataVisualization 1.2
+import QtQuick.Controls
 import "."
 
-Rectangle {
+Item {
     id: mainView
     width: 1280
     height: 720
@@ -154,15 +129,15 @@ Rectangle {
             anchors.fill: parent
             hoverEnabled: true
             acceptedButtons: Qt.LeftButton | Qt.RightButton
-            property int mouseX: -1
-            property int mouseY: -1
+            property int mouseXPos: -1
+            property int mouseYPos: -1
 
-            onPositionChanged: {
-                mouseX = mouse.x;
-                mouseY = mouse.y;
+            onPositionChanged: (mouse)=> {
+                mouseXPos = mouse.x;
+                mouseYPos = mouse.y;
             }
 
-            onWheel: {
+            onWheel: (wheel)=> {
                 // Adjust zoom level based on what zoom range we're in.
                 var zoomLevel = scatterGraph.scene.activeCamera.zoomLevel;
                 if (zoomLevel > 100)
@@ -186,7 +161,8 @@ Rectangle {
             running: true
             repeat: true
             onTriggered: {
-                scatterGraph.scene.selectionQueryPosition = Qt.point(inputArea.mouseX, inputArea.mouseY);
+                scatterGraph.scene.selectionQueryPosition = Qt.point(inputArea.mouseXPos,
+                                                                     inputArea.mouseYPos);
             }
         }
     }
@@ -227,7 +203,7 @@ Rectangle {
         }
     }
 
-    NewButton {
+    Button {
         id: shadowToggle
         width: parent.width / 3 // We're adding 3 buttons and want to divide them equally
         text: "Hide Shadows"
@@ -244,7 +220,7 @@ Rectangle {
         }
     }
 
-    NewButton {
+    Button {
         id: cameraToggle
         width: parent.width / 3
         text: "Pause Camera"
@@ -261,11 +237,11 @@ Rectangle {
         }
     }
 
-    NewButton {
+    Button {
         id: exitButton
         width: parent.width / 3
         text: "Quit"
         anchors.left: cameraToggle.right
-        onClicked: Qt.quit(0);
+        onClicked: Qt.quit();
     }
 }