diff options
Diffstat (limited to 'tests/auto/corelib/kernel/qtranslator')
-rw-r--r-- | tests/auto/corelib/kernel/qtranslator/CMakeLists.txt | 14 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt index dcf977c739..92b6edb17c 100644 --- a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt @@ -1,13 +1,17 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qtranslator.pro. - ##################################################################### ## tst_qtranslator Test: ##################################################################### -if (NOT QT_CONFIG_thread) +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qtranslator LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + +if (NOT QT_FEATURE_thread) return() endif() @@ -31,7 +35,6 @@ qt_internal_add_resource(tst_qtranslator "qtranslator" ${qtranslator_resource_files} ) - ## Scopes: ##################################################################### @@ -51,6 +54,3 @@ if(ANDROID) ${android_testdata_resource_files} ) endif() - -#### Keys ignored in scope 3:.:.:qtranslator.pro:else: -# TESTDATA = "dependencies_la.qm" "hellotr_empty.qm" "hellotr_la.qm" "msgfmt_from_po.qm" diff --git a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp index 372a7a9db1..c76500ea11 100644 --- a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp +++ b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QTest> #include <QWaitCondition> @@ -95,7 +95,7 @@ void tst_QTranslator::load() { QFile file(filepath); - file.open(QFile::ReadOnly); + QVERIFY(file.open(QFile::ReadOnly)); QByteArray data = file.readAll(); QTranslator tor; QVERIFY(tor.load((const uchar *)data.constData(), data.length())); @@ -119,7 +119,7 @@ void tst_QTranslator::load() void tst_QTranslator::loadLocale() { QLocale locale; - auto localeName = locale.uiLanguages().value(0).replace('-', '_'); + auto localeName = locale.uiLanguages(QLocale::TagSeparator::Underscore).value(0); if (localeName.isEmpty()) QSKIP("This test requires at least one available UI language."); @@ -329,7 +329,7 @@ void tst_QTranslator::dependencies() { QTranslator tor( 0 ); QFile file("dependencies_la.qm"); - file.open(QFile::ReadOnly); + QVERIFY(file.open(QFile::ReadOnly)); QByteArray data = file.readAll(); QVERIFY(tor.load((const uchar *)data.constData(), data.length())); QVERIFY(!tor.isEmpty()); |