diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-07-31 09:44:56 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-08-03 04:45:14 +0000 |
| commit | 4914b80f611cac866ce84f2f2fb1b8de24358417 (patch) | |
| tree | 00ab10e6d06bc93cc227b702ec3aa2ec7bf3b128 /tests/auto/qml/debugger/qqmlpreview | |
| parent | a88f01364e147d9ea093bf0fdc639b45feef1788 (diff) | |
Preview: Use QTranslator::install(QLocale, ...)
See commit e6f6c4aee6951a for the matching change
in QQmlApplicationEngine.
Also needed to adapt the autotests, since qt_QT is
not (yet) a valid locale.
Task-number: QTBUG-69196
Change-Id: If92156abbb3e20042a934b8150a8f456d8f770b6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/debugger/qqmlpreview')
| -rw-r--r-- | tests/auto/qml/debugger/qqmlpreview/data/i18n/qml_fr_FR.qm (renamed from tests/auto/qml/debugger/qqmlpreview/data/i18n/qml_qt_QT.qm) | 0 | ||||
| -rw-r--r-- | tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/debugger/qqmlpreview/data/i18n/qml_qt_QT.qm b/tests/auto/qml/debugger/qqmlpreview/data/i18n/qml_fr_FR.qm index e69de29bb2..e69de29bb2 100644 --- a/tests/auto/qml/debugger/qqmlpreview/data/i18n/qml_qt_QT.qm +++ b/tests/auto/qml/debugger/qqmlpreview/data/i18n/qml_fr_FR.qm diff --git a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp index 2bf11b6f36..14254d9725 100644 --- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp +++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp @@ -346,8 +346,8 @@ void tst_QQmlPreview::language() { QCOMPARE(startQmlProcess("window.qml"), ConnectSuccess); QVERIFY(m_client); - m_client->triggerLanguage(dataDirectoryUrl(), "qt_QT"); - QTRY_VERIFY_WITH_TIMEOUT(m_files.contains(testFile("i18n/qml_qt_QT.qm")), 30000); + m_client->triggerLanguage(dataDirectoryUrl(), "fr_FR"); + QTRY_VERIFY_WITH_TIMEOUT(m_files.contains(testFile("i18n/qml_fr_FR.qm")), 30000); } QTEST_MAIN(tst_QQmlPreview) |