6 files changed, 16 insertions, 41 deletions
diff --git a/tests/manual/rhi/rhi.pro b/tests/manual/rhi/rhi.pro
deleted file mode 100644
index fcccdbacb..000000000
--- a/tests/manual/rhi/rhi.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    simple-rhi-cpp \
-    ubo
diff --git a/tests/manual/rhi/simple-rhi-cpp/main.cpp b/tests/manual/rhi/simple-rhi-cpp/main.cpp
index 324e44d26..576094eec 100644
--- a/tests/manual/rhi/simple-rhi-cpp/main.cpp
+++ b/tests/manual/rhi/simple-rhi-cpp/main.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB).
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QGuiApplication>
 
@@ -257,13 +257,13 @@ int main(int argc, char* argv[])
 
     QTimer *cameraAnimationTimer = new QTimer(&view);
     QObject::connect(cameraAnimationTimer, &QTimer::timeout,
-                     [cameraEntity] {
-        static int angle = 0;
-        const float radius = 40.0f;
-        const float anglef = qDegreesToRadians(float(angle));
-        cameraEntity->setPosition(QVector3D(qSin(anglef), 0.0f, qCos(anglef))  * radius);
-        angle += 1;
-    });
+                     cameraEntity, [cameraEntity] {
+                         static int angle = 0;
+                         const float radius = 40.0f;
+                         const float anglef = qDegreesToRadians(float(angle));
+                         cameraEntity->setPosition(QVector3D(qSin(anglef), 0.0f, qCos(anglef)) * radius);
+                         angle += 1;
+                     });
     cameraAnimationTimer->start(16);
 
     // For camera controls
@@ -282,12 +282,12 @@ int main(int argc, char* argv[])
 
     QTimer *parameterAnimationTimer = new QTimer(&view);
     QObject::connect(parameterAnimationTimer, &QTimer::timeout,
-                     [parameter] {
-        static int angle = 0;
-        const float anglef = qDegreesToRadians(float(angle));
-        parameter->setValue(QColor::fromRgbF(fabs(qCos(anglef)), fabs(qSin(anglef)), 1.0f));
-        angle += 10;
-    });
+                     parameter, [parameter] {
+                         static int angle = 0;
+                         const float anglef = qDegreesToRadians(float(angle));
+                         parameter->setValue(QColor::fromRgbF(fabs(qCos(anglef)), fabs(qSin(anglef)), 1.0f));
+                         angle += 10;
+                     });
     parameterAnimationTimer->start(16);
 
     // Torus
diff --git a/tests/manual/rhi/simple-rhi-cpp/simple-rhi-cpp.pro b/tests/manual/rhi/simple-rhi-cpp/simple-rhi-cpp.pro
deleted file mode 100644
index 2d5a4a97c..000000000
--- a/tests/manual/rhi/simple-rhi-cpp/simple-rhi-cpp.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-!include( ../../manual.pri ) {
-    error( "Couldn't find the manual.pri file!" )
-}
-
-QT += 3dcore 3drender 3dinput 3dextras
-
-SOURCES += \
-    main.cpp
-
-RESOURCES += qtlogo.png
diff --git a/tests/manual/rhi/ubo/main.cpp b/tests/manual/rhi/ubo/main.cpp
index 5b0181037..0bb6f50ec 100644
--- a/tests/manual/rhi/ubo/main.cpp
+++ b/tests/manual/rhi/ubo/main.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QGuiApplication>
 #include <Qt3DQuickExtras/qt3dquickwindow.h>
diff --git a/tests/manual/rhi/ubo/main.qml b/tests/manual/rhi/ubo/main.qml
index a007ba02e..7d54a3f15 100644
--- a/tests/manual/rhi/ubo/main.qml
+++ b/tests/manual/rhi/ubo/main.qml
@@ -1,5 +1,5 @@
 // Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 import QtQuick 2.15 as QQ2
 import Qt3D.Core 2.15
diff --git a/tests/manual/rhi/ubo/ubo.pro b/tests/manual/rhi/ubo/ubo.pro
deleted file mode 100644
index 6fb2c223d..000000000
--- a/tests/manual/rhi/ubo/ubo.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-!include( ../../manual.pri ) {
-    error( "Couldn't find the manual.pri file!" )
-}
-
-QT += 3dcore 3drender 3dinput 3dextras
-
-SOURCES += \
-    main.cpp
-
-RESOURCES += main.qml