diff options
Diffstat (limited to 'tests/auto/testlib/selftests/datetime')
4 files changed, 16 insertions, 62 deletions
diff --git a/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt deleted file mode 100644 index eb0040c218..0000000000 --- a/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Generated from datetime.pro. - -##################################################################### -## datetime Binary: -##################################################################### - -qt_add_executable(datetime - SOURCES - tst_datetime.cpp - PUBLIC_LIBRARIES - Qt::Test -) - -## Scopes: -##################################################################### diff --git a/tests/auto/testlib/selftests/datetime/CMakeLists.txt b/tests/auto/testlib/selftests/datetime/CMakeLists.txt index ade9978801..e644d7200a 100644 --- a/tests/auto/testlib/selftests/datetime/CMakeLists.txt +++ b/tests/auto/testlib/selftests/datetime/CMakeLists.txt @@ -1,21 +1,21 @@ -# Generated from datetime.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## datetime Binary: ##################################################################### -qt_add_executable(datetime - NO_INSTALL # special case - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case +qt_internal_add_executable(datetime + NO_INSTALL + EXCEPTIONS + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} SOURCES tst_datetime.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Test ) ## Scopes: ##################################################################### -# special case begin -qt_apply_testlib_coverage_options(datetime) -# special case end +qt_internal_apply_testlib_coverage_options(datetime) diff --git a/tests/auto/testlib/selftests/datetime/datetime.pro b/tests/auto/testlib/selftests/datetime/datetime.pro deleted file mode 100644 index 1524281090..0000000000 --- a/tests/auto/testlib/selftests/datetime/datetime.pro +++ /dev/null @@ -1,9 +0,0 @@ -SOURCES += tst_datetime.cpp -QT = core testlib - -mac:CONFIG -= app_bundle -CONFIG -= debug_and_release_target - -TARGET = datetime - -include($$QT_SOURCE_TREE/src/testlib/selfcover.pri) diff --git a/tests/auto/testlib/selftests/datetime/tst_datetime.cpp b/tests/auto/testlib/selftests/datetime/tst_datetime.cpp index 02123382c1..68e47d0868 100644 --- a/tests/auto/testlib/selftests/datetime/tst_datetime.cpp +++ b/tests/auto/testlib/selftests/datetime/tst_datetime.cpp @@ -1,35 +1,11 @@ -/**************************************************************************** -** -** 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 <QtCore/QCoreApplication> #include <QtCore/QDateTime> -#include <QtTest/QtTest> +#include <QtCore/QTimeZone> +#include <QTest> /*! \internal @@ -46,8 +22,10 @@ private slots: void tst_DateTime::dateTime() const { - const QDateTime utc(QDate(2000, 5, 3), QTime(4, 3, 4), Qt::UTC); - const QDateTime local(QDate(2000, 5, 3), QTime(4, 3, 4), Qt::OffsetFromUTC, 120 /* 2 minutes */); + const auto twoMinutes = std::chrono::minutes{2}; + const QDateTime utc(QDate(2000, 5, 3), QTime(4, 3, 4), QTimeZone::UTC); + const QDateTime local(QDate(2000, 5, 3), QTime(4, 3, 4), + QTimeZone::fromDurationAheadOfUtc(twoMinutes)); QCOMPARE(local, utc); } |