diff options
Diffstat (limited to 'tests/auto/other/languagechange')
| -rw-r--r-- | tests/auto/other/languagechange/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | tests/auto/other/languagechange/languagechange.pro | 5 | ||||
| -rw-r--r-- | tests/auto/other/languagechange/tst_languagechange.cpp | 38 |
3 files changed, 17 insertions, 45 deletions
diff --git a/tests/auto/other/languagechange/CMakeLists.txt b/tests/auto/other/languagechange/CMakeLists.txt index 0ace85d654..07f3547d58 100644 --- a/tests/auto/other/languagechange/CMakeLists.txt +++ b/tests/auto/other/languagechange/CMakeLists.txt @@ -1,21 +1,22 @@ -# Generated from languagechange.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_languagechange Test: ##################################################################### -qt_add_test(tst_languagechange +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_languagechange LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + +qt_internal_add_test(tst_languagechange SOURCES tst_languagechange.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::Gui Qt::GuiPrivate Qt::Widgets ) - -## Scopes: -##################################################################### - -#### Keys ignored in scope 2:.:.:languagechange.pro:WIN32: -# testcase.timeout = "1800" diff --git a/tests/auto/other/languagechange/languagechange.pro b/tests/auto/other/languagechange/languagechange.pro deleted file mode 100644 index 7dbd47f63d..0000000000 --- a/tests/auto/other/languagechange/languagechange.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -win32:testcase.timeout = 1800 # test runtime varies greatly on Windows, QTBUG-26006 -TARGET = tst_languagechange -QT += widgets core-private gui-private testlib -SOURCES += tst_languagechange.cpp diff --git a/tests/auto/other/languagechange/tst_languagechange.cpp b/tests/auto/other/languagechange/tst_languagechange.cpp index 44eaa2e46f..8f99730a19 100644 --- a/tests/auto/other/languagechange/tst_languagechange.cpp +++ b/tests/auto/other/languagechange/tst_languagechange.cpp @@ -1,33 +1,9 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - - -#include <QtTest/QtTest> +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + + +#include <QTest> +#include <QTimer> #include <qapplication.h> #include <private/qguiapplication_p.h> @@ -285,7 +261,7 @@ void tst_languageChange::retranslatability() // In case we use a Color dialog, we do not want to test for // strings non existing in the dialog and which do not get // translated. - const QSize desktopSize = QApplication::desktop()->size(); + const QSize desktopSize = QGuiApplication::primaryScreen()->size(); if (dialogType == ColorDialog && (desktopSize.width() < 480 || desktopSize.height() < 350)) { expected.remove("QColorDialog::&Basic colors"); expected.remove("QColorDialog::&Custom colors"); |