diff options
Diffstat (limited to 'tests/auto/render/opengl/renderqueue')
-rw-r--r-- | tests/auto/render/opengl/renderqueue/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/auto/render/opengl/renderqueue/renderqueue.pro | 14 | ||||
-rw-r--r-- | tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp | 32 |
3 files changed, 7 insertions, 42 deletions
diff --git a/tests/auto/render/opengl/renderqueue/CMakeLists.txt b/tests/auto/render/opengl/renderqueue/CMakeLists.txt index a2c5cb688..ed215fcd0 100644 --- a/tests/auto/render/opengl/renderqueue/CMakeLists.txt +++ b/tests/auto/render/opengl/renderqueue/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from renderqueue.pro. ##################################################################### diff --git a/tests/auto/render/opengl/renderqueue/renderqueue.pro b/tests/auto/render/opengl/renderqueue/renderqueue.pro deleted file mode 100644 index 19106ba92..000000000 --- a/tests/auto/render/opengl/renderqueue/renderqueue.pro +++ /dev/null @@ -1,14 +0,0 @@ -TEMPLATE = app - -TARGET = tst_renderqueue - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_renderqueue.cpp - -include(../../../core/common/common.pri) - -# Link Against OpenGL Renderer Plugin -include(../opengl_render_plugin.pri) diff --git a/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp b/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp index ca176f7c2..f6abfdf36 100644 --- a/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp +++ b/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2014 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) 2014 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <QMutex> @@ -199,7 +174,8 @@ void tst_RenderQueue::concurrentQueueAccess() // WHEN unlocked // THEN QVERIFY (renderQueue->isFrameQueueComplete()); - QCOMPARE(renderQueue->nextFrameQueue().size(), renderQueue->targetRenderViewCount()); + QCOMPARE(renderQueue->nextFrameQueue().size(), + size_t(renderQueue->targetRenderViewCount())); // reset queue for next frame renderQueue->reset(); |