summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/qdispatchcompute
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/render/qdispatchcompute')
-rw-r--r--tests/auto/render/qdispatchcompute/CMakeLists.txt11
-rw-r--r--tests/auto/render/qdispatchcompute/qdispatchcompute.pro12
-rw-r--r--tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp41
3 files changed, 18 insertions, 46 deletions
diff --git a/tests/auto/render/qdispatchcompute/CMakeLists.txt b/tests/auto/render/qdispatchcompute/CMakeLists.txt
index a7a16da4a..2bef1a9ea 100644
--- a/tests/auto/render/qdispatchcompute/CMakeLists.txt
+++ b/tests/auto/render/qdispatchcompute/CMakeLists.txt
@@ -1,13 +1,22 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
# Generated from qdispatchcompute.pro.
#####################################################################
## tst_qdispatchcompute Test:
#####################################################################
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(tst_qdispatchcompute LANGUAGES CXX)
+ find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
qt_internal_add_test(tst_qdispatchcompute
SOURCES
tst_qdispatchcompute.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::3DCore
Qt::3DCorePrivate
Qt::3DRender
diff --git a/tests/auto/render/qdispatchcompute/qdispatchcompute.pro b/tests/auto/render/qdispatchcompute/qdispatchcompute.pro
deleted file mode 100644
index 163c17010..000000000
--- a/tests/auto/render/qdispatchcompute/qdispatchcompute.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-
-TARGET = tst_qdispatchcompute
-
-QT += 3dcore 3dcore-private 3drender 3drender-private testlib
-
-CONFIG += testcase
-
-SOURCES += tst_qdispatchcompute.cpp
-
-include(../../core/common/common.pri)
-include(../commons/commons.pri)
diff --git a/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp b/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp
index f54edf8c2..cbb323d5b 100644
--- a/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp
+++ b/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** 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 Klaralvdalens Datakonsult AB (KDAB).
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtTest/QTest>
@@ -65,7 +40,7 @@ private Q_SLOTS:
// THEN
QVERIFY(spy.isValid());
QCOMPARE(dispatchCompute.workGroupX(), newValue);
- QCOMPARE(spy.count(), 1);
+ QCOMPARE(spy.size(), 1);
// WHEN
spy.clear();
@@ -73,7 +48,7 @@ private Q_SLOTS:
// THEN
QCOMPARE(dispatchCompute.workGroupX(), newValue);
- QCOMPARE(spy.count(), 0);
+ QCOMPARE(spy.size(), 0);
}
{
// WHEN
@@ -84,7 +59,7 @@ private Q_SLOTS:
// THEN
QVERIFY(spy.isValid());
QCOMPARE(dispatchCompute.workGroupY(), newValue);
- QCOMPARE(spy.count(), 1);
+ QCOMPARE(spy.size(), 1);
// WHEN
spy.clear();
@@ -92,7 +67,7 @@ private Q_SLOTS:
// THEN
QCOMPARE(dispatchCompute.workGroupY(), newValue);
- QCOMPARE(spy.count(), 0);
+ QCOMPARE(spy.size(), 0);
}
{
// WHEN
@@ -103,7 +78,7 @@ private Q_SLOTS:
// THEN
QVERIFY(spy.isValid());
QCOMPARE(dispatchCompute.workGroupZ(), newValue);
- QCOMPARE(spy.count(), 1);
+ QCOMPARE(spy.size(), 1);
// WHEN
spy.clear();
@@ -111,7 +86,7 @@ private Q_SLOTS:
// THEN
QCOMPARE(dispatchCompute.workGroupZ(), newValue);
- QCOMPARE(spy.count(), 0);
+ QCOMPARE(spy.size(), 0);
}
}