diff options
Diffstat (limited to 'tests/auto/other/languagechange/tst_languagechange.cpp')
| -rw-r--r-- | tests/auto/other/languagechange/tst_languagechange.cpp | 48 |
1 files changed, 9 insertions, 39 deletions
diff --git a/tests/auto/other/languagechange/tst_languagechange.cpp b/tests/auto/other/languagechange/tst_languagechange.cpp index 632039ec5a..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> @@ -84,7 +60,7 @@ public: TransformTranslator() : QTranslator() {} TransformTranslator(QObject *parent) : QTranslator(parent) {} QString translate(const char *context, const char *sourceText, - const char *disambiguation = 0, int = -1) const + const char *disambiguation = 0, int = -1) const override { QByteArray total(context); total.append("::"); @@ -108,7 +84,7 @@ public: return res; } - virtual bool isEmpty() const { return false; } + virtual bool isEmpty() const override { return false; } public: mutable QSet<QByteArray> m_translations; @@ -196,9 +172,6 @@ void tst_languageChange::retranslatability_data() << "QFileDialog::Back" << "QFileDialog::Create New Folder" << "QFileDialog::Detail View" -#if !defined(Q_OS_MAC) - << "QFileDialog::File" -#endif << "QFileDialog::Files of type:" << "QFileDialog::Forward" << "QFileDialog::List View" @@ -259,9 +232,6 @@ void tst_languageChange::retranslatability() #endif break; case FileDialog: { -#ifdef Q_OS_MAC - QSKIP("The native file dialog is used on Mac OS"); -#endif QFileDialog dlg; dlg.setOption(QFileDialog::DontUseNativeDialog); QString tempDirPattern = QDir::tempPath(); @@ -291,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"); |