3 files changed, 14 insertions, 40 deletions
diff --git a/tests/auto/cpptest/q3dscene-light/CMakeLists.txt b/tests/auto/cpptest/q3dscene-light/CMakeLists.txt
new file mode 100644
index 00000000..fc70b804
--- /dev/null
+++ b/tests/auto/cpptest/q3dscene-light/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+qt_internal_add_test(q3dscene-light_datavis
+    SOURCES
+        tst_light.cpp
+    LIBRARIES
+        Qt::Gui
+        Qt::DataVisualization
+)
diff --git a/tests/auto/cpptest/q3dscene-light/q3dscene-light.pro b/tests/auto/cpptest/q3dscene-light/q3dscene-light.pro
deleted file mode 100644
index 21a3c934..00000000
--- a/tests/auto/cpptest/q3dscene-light/q3dscene-light.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-QT += testlib datavisualization
-
-TARGET = tst_cpptest
-CONFIG += console testcase
-
-TEMPLATE = app
-
-SOURCES += tst_light.cpp
diff --git a/tests/auto/cpptest/q3dscene-light/tst_light.cpp b/tests/auto/cpptest/q3dscene-light/tst_light.cpp
index d5eb4507..fb5ba325 100644
--- a/tests/auto/cpptest/q3dscene-light/tst_light.cpp
+++ b/tests/auto/cpptest/q3dscene-light/tst_light.cpp
@@ -1,38 +1,10 @@
-/****************************************************************************
-**
-** 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 <QtTest/QtTest>
 
 #include <QtDataVisualization/Q3DLight>
 
-using namespace QtDataVisualization;
-
 class tst_light: public QObject
 {
     Q_OBJECT
@@ -96,8 +68,8 @@ void tst_light::initializeProperties()
     QCOMPARE(m_light->isAutoPosition(), true);
 
     // Common (from Q3DObject)
-    m_light->setPosition(QVector3D(1.0, 1.0, 1.0));
-    QCOMPARE(m_light->position(), QVector3D(1.0, 1.0, 1.0));
+    m_light->setPosition(QVector3D(1.0f, 1.0f, 1.0f));
+    QCOMPARE(m_light->position(), QVector3D(1.0f, 1.0f, 1.0f));
 }
 
 QTEST_MAIN(tst_light)