diff options
Diffstat (limited to 'tests/benchmarks/gui/math3d')
8 files changed, 17 insertions, 81 deletions
diff --git a/tests/benchmarks/gui/math3d/CMakeLists.txt b/tests/benchmarks/gui/math3d/CMakeLists.txt index 53e56a83a3..f8e6f7b16c 100644 --- a/tests/benchmarks/gui/math3d/CMakeLists.txt +++ b/tests/benchmarks/gui/math3d/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from math3d.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(qmatrix4x4) add_subdirectory(qquaternion) diff --git a/tests/benchmarks/gui/math3d/math3d.pro b/tests/benchmarks/gui/math3d/math3d.pro deleted file mode 100644 index c511d9a904..0000000000 --- a/tests/benchmarks/gui/math3d/math3d.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ - qmatrix4x4 \ - qquaternion diff --git a/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt b/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt index 28ada45257..2929d2d46f 100644 --- a/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt +++ b/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from qmatrix4x4.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_bench_qmatrix4x4 Binary: @@ -7,10 +8,7 @@ qt_internal_add_benchmark(tst_bench_qmatrix4x4 SOURCES tst_qmatrix4x4.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Test ) - -#### Keys ignored in scope 1:.:.:qmatrix4x4.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/benchmarks/gui/math3d/qmatrix4x4/qmatrix4x4.pro b/tests/benchmarks/gui/math3d/qmatrix4x4/qmatrix4x4.pro deleted file mode 100644 index fe5c23840f..0000000000 --- a/tests/benchmarks/gui/math3d/qmatrix4x4/qmatrix4x4.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = app -TARGET = tst_bench_qmatrix4x4 -QT += testlib -SOURCES += tst_qmatrix4x4.cpp - diff --git a/tests/benchmarks/gui/math3d/qmatrix4x4/tst_qmatrix4x4.cpp b/tests/benchmarks/gui/math3d/qmatrix4x4/tst_qmatrix4x4.cpp index db9f2bbfb7..ebc61495dd 100644 --- a/tests/benchmarks/gui/math3d/qmatrix4x4/tst_qmatrix4x4.cpp +++ b/tests/benchmarks/gui/math3d/qmatrix4x4/tst_qmatrix4x4.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtOpenGL 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 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QTest> #include <QtGui/qmatrix4x4.h> @@ -210,7 +185,8 @@ void tst_QMatrix4x4::mapVector3D() m1.optimize(); QBENCHMARK { - result = m1 * v; + result = m1.map(v); + Q_UNUSED(result) } // Force the result to be stored so the compiler doesn't @@ -234,7 +210,8 @@ void tst_QMatrix4x4::mapVector2D() m1.optimize(); QBENCHMARK { - result = m1 * v; + result = m1.map(v); + Q_UNUSED(result) } // Force the result to be stored so the compiler doesn't diff --git a/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt b/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt index 147f4ce15f..e5880c0916 100644 --- a/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt +++ b/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from qquaternion.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_bench_qquaternion Binary: @@ -7,10 +8,7 @@ qt_internal_add_benchmark(tst_bench_qquaternion SOURCES tst_qquaternion.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::Test ) - -#### Keys ignored in scope 1:.:.:qquaternion.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/benchmarks/gui/math3d/qquaternion/qquaternion.pro b/tests/benchmarks/gui/math3d/qquaternion/qquaternion.pro deleted file mode 100644 index e57a3e6a38..0000000000 --- a/tests/benchmarks/gui/math3d/qquaternion/qquaternion.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = app -TARGET = tst_bench_qquaternion -QT += testlib -SOURCES += tst_qquaternion.cpp - diff --git a/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp b/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp index 05c09712cd..07b47d6401 100644 --- a/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp +++ b/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite 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 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <qtest.h> #include <QQuaternion> @@ -102,6 +77,7 @@ void tst_QQuaternion::multiply() QBENCHMARK { QQuaternion q3 = q1 * q2; + Q_UNUSED(q3) } } |