aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/nodes
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2021-06-04 11:50:03 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2021-06-08 20:59:26 +0200
commitb5b0a39a2aa3ec98e221bc2ef0080d9b879304d5 (patch)
tree8d7cd4300544c90a0868a02d2d3c55ed19ca4922 /tests/auto/quick/nodes
parentef7544bb5c6156462d169954c55afd38141e5a74 (diff)
Add missing Quick autotests to CMakeLists
Restore autotests that went missing in the tests/auto/quick project file during the qmake->CMake conversion. Adjust the conditions as relevant for Qt 6, e.g. the qmake project still had some now-unnecessary OpenGL and Widgets conditions. The rendernode test has not been fully migrated to Qt 6 and it's pretty much just QSKIPs for now. This is to be remedied at a later point. The drawingmodes test gets one test disabled for macOS due to unexpected results in the Apple M1 CI configuration (which now has Metal, unlike other the Intel macOS VMs), to be checked later. Do some necessary source code changes as well. Some of these tests did not even compile since they were not exercised in the CI for some time now. Change-Id: Ibcdd7d61f72165ce1c11847d02635340be0c44b1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Diffstat (limited to 'tests/auto/quick/nodes')
-rw-r--r--tests/auto/quick/nodes/tst_nodestest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/nodes/tst_nodestest.cpp b/tests/auto/quick/nodes/tst_nodestest.cpp
index fa53ebfa02..af2121f6a5 100644
--- a/tests/auto/quick/nodes/tst_nodestest.cpp
+++ b/tests/auto/quick/nodes/tst_nodestest.cpp
@@ -83,7 +83,7 @@ public:
NodesTest();
private Q_SLOTS:
- void initTestCase() override;
+ void initTestCase();
void cleanupTestCase();
// Root nodes