6 files changed, 47 insertions, 158 deletions
diff --git a/tests/manual/qmlmultitest/CMakeLists.txt b/tests/manual/qmlmultitest/CMakeLists.txt
new file mode 100644
index 00000000..a92ff8db
--- /dev/null
+++ b/tests/manual/qmlmultitest/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+qt_internal_add_manual_test(qmlmultitest
+    GUI
+    SOURCES
+        main.cpp
+    )
+target_link_libraries(qmlmultitest PUBLIC
+    Qt::Gui
+    Qt::Qml
+    Qt::Quick
+    Qt::DataVisualization
+    )
+
+set(qmlmultitest_resource_files
+    "qml/qmlmultitest/Data.qml"
+    "qml/qmlmultitest/main.qml"
+    )
+
+qt_internal_add_resource(qmlmultitest "qmlmultitest"
+    PREFIX
+    "/"
+    FILES
+    ${qmlmultitest_resource_files}
+    )
diff --git a/tests/manual/qmlmultitest/main.cpp b/tests/manual/qmlmultitest/main.cpp
index e6010697..555dff63 100644
--- a/tests/manual/qmlmultitest/main.cpp
+++ b/tests/manual/qmlmultitest/main.cpp
@@ -1,31 +1,5 @@
-/****************************************************************************
-**
-** 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
 
 #include <QtGui/QGuiApplication>
 #include <QtCore/QDir>
@@ -34,6 +8,7 @@
 
 int main(int argc, char *argv[])
 {
+    qputenv("QSG_RHI_BACKEND", "opengl");
     QGuiApplication app(argc, argv);
 
     QQuickView viewer;
diff --git a/tests/manual/qmlmultitest/qml/qmlmultitest/Data.qml b/tests/manual/qmlmultitest/qml/qmlmultitest/Data.qml
index 9bbbd7f8..78e65575 100644
--- a/tests/manual/qmlmultitest/qml/qmlmultitest/Data.qml
+++ b/tests/manual/qmlmultitest/qml/qmlmultitest/Data.qml
@@ -1,33 +1,7 @@
-/****************************************************************************
-**
-** 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 QtQuick
 
 Item {
     property alias sharedData: dataModel
diff --git a/tests/manual/qmlmultitest/qml/qmlmultitest/NewButton.qml b/tests/manual/qmlmultitest/qml/qmlmultitest/NewButton.qml
deleted file mode 100644
index 19309cca..00000000
--- a/tests/manual/qmlmultitest/qml/qmlmultitest/NewButton.qml
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
-
-Item {
-    id: newbutton
-
-    property alias text: buttonText.text
-
-    signal clicked
-
-    implicitWidth: buttonText.implicitWidth + 5
-    implicitHeight: buttonText.implicitHeight + 10
-
-    Button {
-        id: buttonText
-        width: parent.width
-        height: parent.height
-
-        style: ButtonStyle {
-            label: Component {
-                Text {
-                    text: buttonText.text
-                    clip: true
-                    wrapMode: Text.WordWrap
-                    verticalAlignment: Text.AlignVCenter
-                    horizontalAlignment: Text.AlignHCenter
-                    anchors.fill: parent
-                }
-            }
-        }
-        onClicked: newbutton.clicked()
-    }
-}
diff --git a/tests/manual/qmlmultitest/qml/qmlmultitest/main.qml b/tests/manual/qmlmultitest/qml/qmlmultitest/main.qml
index 388cf391..493feb79 100644
--- a/tests/manual/qmlmultitest/qml/qmlmultitest/main.qml
+++ b/tests/manual/qmlmultitest/qml/qmlmultitest/main.qml
@@ -1,38 +1,13 @@
-/****************************************************************************
-**
-** 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 QtQuick.Layouts 1.0
-import QtDataVisualization 1.1
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtDataVisualization 1.2
 import "."
 
-Rectangle {
+Item {
     id: mainView
     width: 800
     height: 600
@@ -56,6 +31,7 @@ Rectangle {
             Layout.fillWidth: true
             border.color: surfaceGraph.theme.gridLineColor
             border.width: 2
+            color: "#00000000"
 
             Surface3D {
                 id: surfaceGraph
@@ -106,7 +82,7 @@ Rectangle {
                 anchors.bottom: parent.bottom
                 columns: 2
 
-                NewButton {
+                Button {
                     Layout.minimumWidth: parent.width / 2
                     Layout.fillHeight: true
                     Layout.fillWidth: true
@@ -114,22 +90,22 @@ Rectangle {
                     onClicked: clearSelections() // call a helper function to keep button itself simpler
                 }
 
-                NewButton {
+                Button {
                     Layout.minimumWidth: parent.width / 2
                     Layout.fillHeight: true
                     Layout.fillWidth: true
                     text: "Quit"
-                    onClicked: Qt.quit(0);
+                    onClicked: Qt.quit();
                 }
 
-                NewButton {
+                Button {
                     Layout.fillHeight: true
                     Layout.fillWidth: true
                     text: "Reset Cameras"
                     onClicked: resetCameras() // call a helper function to keep button itself simpler
                 }
 
-                NewButton {
+                Button {
                     id: mmbButton
                     Layout.fillHeight: true
                     Layout.fillWidth: true
@@ -144,6 +120,7 @@ Rectangle {
             Layout.fillWidth: true
             border.color: scatterGraph.theme.gridLineColor
             border.width: 2
+            color: "#00000000"
 
             Scatter3D {
                 id: scatterGraph
@@ -184,6 +161,7 @@ Rectangle {
             Layout.fillWidth: true
             border.color: barGraph.theme.gridLineColor
             border.width: 2
+            color: "#00000000"
 
             Bars3D {
                 id: barGraph
diff --git a/tests/manual/qmlmultitest/qmlmultitest.qrc b/tests/manual/qmlmultitest/qmlmultitest.qrc
index 7fc9ade2..ae52b7e7 100644
--- a/tests/manual/qmlmultitest/qmlmultitest.qrc
+++ b/tests/manual/qmlmultitest/qmlmultitest.qrc
@@ -2,6 +2,5 @@
     <qresource prefix="/">
         <file>qml/qmlmultitest/Data.qml</file>
         <file>qml/qmlmultitest/main.qml</file>
-        <file>qml/qmlmultitest/NewButton.qml</file>
     </qresource>
 </RCC>