diff options
Diffstat (limited to 'tests/shared/localechange.h')
| -rw-r--r-- | tests/shared/localechange.h | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/tests/shared/localechange.h b/tests/shared/localechange.h index 9b6deaa29d..74ed444ba6 100644 --- a/tests/shared/localechange.h +++ b/tests/shared/localechange.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 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) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QT_TESTS_SHARED_LOCALE_CHANGE_H #define QT_TESTS_SHARED_LOCALE_CHANGE_H @@ -37,7 +12,7 @@ namespace QTestLocaleChange { - QLocale resetSystemLocale() + inline QLocale resetSystemLocale() { #ifndef QT_NO_SYSTEMLOCALE { // Transient instance marks system locale data as stale: @@ -52,8 +27,7 @@ namespace QTestLocaleChange { const int m_category; const QByteArray m_prior; const bool m_didSet; -#if !defined(QT_NO_SYSTEMLOCALE) && defined(Q_OS_UNIX) \ - && (!defined(Q_OS_DARWIN) || defined(Q_OS_NACL)) +#if !defined(QT_NO_SYSTEMLOCALE) && defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) #define TRANSIENT_ENV // Unix system locale consults environment variables, so we need to set // the appropriate one, too. @@ -65,7 +39,7 @@ namespace QTestLocaleChange { #define CASE(cat) case cat: return #cat CASE(LC_ALL); CASE(LC_NUMERIC); CASE(LC_TIME); CASE(LC_MONETARY); CASE(LC_MESSAGES); CASE(LC_COLLATE); -#if !defined(Q_OS_QNX) && !defined(Q_OS_INTEGRITY) +#ifdef LC_MEASUREMENT CASE(LC_MEASUREMENT); #endif #undef CASE |