3 files changed, 15 insertions, 19 deletions
diff --git a/tests/auto/render/qmesh/CMakeLists.txt b/tests/auto/render/qmesh/CMakeLists.txt
index f607df415..0ff1c8bad 100644
--- a/tests/auto/render/qmesh/CMakeLists.txt
+++ b/tests/auto/render/qmesh/CMakeLists.txt
@@ -7,6 +7,12 @@
 ## tst_qmesh Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qmesh LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qmesh
     SOURCES
         tst_qmesh.cpp
diff --git a/tests/auto/render/qmesh/qmesh.pro b/tests/auto/render/qmesh/qmesh.pro
deleted file mode 100644
index 8d0e69abc..000000000
--- a/tests/auto/render/qmesh/qmesh.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-
-TARGET = tst_qmesh
-
-QT += 3dcore 3dcore-private 3drender 3drender-private testlib
-
-CONFIG += testcase
-
-SOURCES += tst_qmesh.cpp
-
-include(../../core/common/common.pri)
-include(../commons/commons.pri)
diff --git a/tests/auto/render/qmesh/tst_qmesh.cpp b/tests/auto/render/qmesh/tst_qmesh.cpp
index 6dad93483..598cb840b 100644
--- a/tests/auto/render/qmesh/tst_qmesh.cpp
+++ b/tests/auto/render/qmesh/tst_qmesh.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 Paul Lemire <paul.lemire350@gmail.com>
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 // TODO Remove in Qt6
 #include <QtCore/qcompilerdetection.h>
@@ -8,6 +8,8 @@ QT_WARNING_DISABLE_DEPRECATED
 #include <QtTest/QTest>
 #include <Qt3DRender/qmesh.h>
 #include <Qt3DRender/private/qmesh_p.h>
+#include <Qt3DCore/qaspectengine.h>
+#include <Qt3DCore/private/qaspectengine_p.h>
 #include <QObject>
 #include <QSignalSpy>
 #include <Qt3DCore/private/qscene_p.h>
@@ -88,11 +90,11 @@ private Q_SLOTS:
     {
         // GIVEN
         TestArbiter arbiter;
+        Qt3DCore::QAspectEngine engine;
+        Qt3DCore::QScene *scene = Qt3DCore::QAspectEnginePrivate::get(&engine)->m_scene;
         Qt3DRender::QMesh mesh;
-        arbiter.setArbiterOnNode(&mesh);
 
-        Qt3DCore::QAspectEngine *engine = reinterpret_cast<Qt3DCore::QAspectEngine*>(0xdeadbeefL);
-        Qt3DCore::QScene *scene = new Qt3DCore::QScene(engine);
+        arbiter.setArbiterOnNode(&mesh);
         Qt3DCore::QNodePrivate *meshd = Qt3DCore::QNodePrivate::get(&mesh);
         meshd->setScene(scene);
         QCoreApplication::processEvents();
@@ -125,11 +127,11 @@ private Q_SLOTS:
     {
         // GIVEN
         TestArbiter arbiter;
+        Qt3DCore::QAspectEngine engine;
+        Qt3DCore::QScene *scene = Qt3DCore::QAspectEnginePrivate::get(&engine)->m_scene;
         Qt3DRender::QMesh mesh;
-        arbiter.setArbiterOnNode(&mesh);
 
-        Qt3DCore::QAspectEngine *engine = reinterpret_cast<Qt3DCore::QAspectEngine*>(0xdeadbeefL);
-        Qt3DCore::QScene *scene = new Qt3DCore::QScene(engine);
+        arbiter.setArbiterOnNode(&mesh);
         Qt3DCore::QNodePrivate *meshd = Qt3DCore::QNodePrivate::get(&mesh);
         meshd->setScene(scene);
         QCoreApplication::processEvents();