diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-14 12:59:07 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-14 16:31:09 +0200 |
| commit | fe3bd212fc85b6c3a64bb8bd5beca4ff4d3493a1 (patch) | |
| tree | b96dd84abfb6ac25b26539999bf2d7d427f347dd /tests/benchmarks/corelib/tools/qtimezone | |
| parent | 72066a3a585b4f4fed499c64464ca5ad2ba9f71d (diff) | |
| parent | ae97d11589dd03edeea0475163e6110869143b35 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
This changes many different CMake places to mention Qt6 instead of
Qt5.
Note that some old qt5 cmake config files in corelib are probably not
needed anymore, but I still renamed and kept them for now.
Change-Id: Ie69e81540386a5af153f76c0242e18d48211bec4
Diffstat (limited to 'tests/benchmarks/corelib/tools/qtimezone')
| -rw-r--r-- | tests/benchmarks/corelib/tools/qtimezone/main.cpp | 52 | ||||
| -rw-r--r-- | tests/benchmarks/corelib/tools/qtimezone/qtimezone.pro | 4 |
2 files changed, 0 insertions, 56 deletions
diff --git a/tests/benchmarks/corelib/tools/qtimezone/main.cpp b/tests/benchmarks/corelib/tools/qtimezone/main.cpp deleted file mode 100644 index 65455a7261..0000000000 --- a/tests/benchmarks/corelib/tools/qtimezone/main.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author David Faure <david.faure@kdab.com> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore 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$ -** -****************************************************************************/ - -#include <QTimeZone> -#include <QTest> -#include <qdebug.h> - -class tst_QTimeZone : public QObject -{ - Q_OBJECT - -private Q_SLOTS: - void isTimeZoneIdAvailable(); -}; - -void tst_QTimeZone::isTimeZoneIdAvailable() -{ - const QList<QByteArray> available = QTimeZone::availableTimeZoneIds(); - QBENCHMARK { - for (const QByteArray &id : available) - QVERIFY(QTimeZone::isTimeZoneIdAvailable(id)); - } -} - -QTEST_MAIN(tst_QTimeZone) - -#include "main.moc" diff --git a/tests/benchmarks/corelib/tools/qtimezone/qtimezone.pro b/tests/benchmarks/corelib/tools/qtimezone/qtimezone.pro deleted file mode 100644 index d0531b568b..0000000000 --- a/tests/benchmarks/corelib/tools/qtimezone/qtimezone.pro +++ /dev/null @@ -1,4 +0,0 @@ -TARGET = tst_bench_qtimezone -QT = core testlib - -SOURCES += main.cpp |