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>

6 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp
index af0a2bacdc..63397be499 100644
--- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp
+++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp
@@ -243,18 +243,18 @@ void QQmlPreviewHandler::removeTranslators()
     }
 }
 
-void QQmlPreviewHandler::language(const QUrl &context, const QString &locale)
+void QQmlPreviewHandler::language(const QUrl &context, const QLocale &locale)
 {
     removeTranslators();
 
     m_qtTranslator.reset(new QTranslator(this));
-    if (m_qtTranslator->load(QLatin1String("qt_") + locale,
+    if (m_qtTranslator->load(locale, QLatin1String("qt"), QLatin1String("_"),
                            QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
         QCoreApplication::installTranslator(m_qtTranslator.get());
     }
 
     m_qmlTranslator.reset(new QTranslator(this));
-    if (m_qmlTranslator->load(QLatin1String("qml_" ) + locale,
+    if (m_qmlTranslator->load(locale, QLatin1String("qml"), QLatin1String("_"),
                               context.toLocalFile() + QLatin1String("/i18n"))) {
         QCoreApplication::installTranslator(m_qmlTranslator.get());
     }
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h
index 6d2a77cf0b..d5888d67a4 100644
--- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h
+++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h
@@ -69,7 +69,7 @@ public:
     void loadUrl(const QUrl &url);
     void rerun();
     void zoom(qreal newFactor);
-    void language(const QUrl &context, const QString &locale);
+    void language(const QUrl &context, const QLocale &locale);
 
     void clear();
 
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.cpp
index b06e8e9008..b6074f5712 100644
--- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.cpp
@@ -129,7 +129,7 @@ void QQmlPreviewServiceImpl::messageReceived(const QByteArray &data)
         QString locale;
         packet >> context >> locale;
         emit language(context.isEmpty() ? m_currentUrl : context,
-                      locale.isEmpty() ? QLocale::system().name() : locale);
+                      locale.isEmpty() ? QLocale() : QLocale(locale));
         break;
     }
     default:
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.h b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.h
index ee59f4f3af..4ddbf949b7 100644
--- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.h
+++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.h
@@ -88,7 +88,7 @@ signals:
     void rerun();
     void clearCache();
     void zoom(qreal factor);
-    void language(const QUrl &context, const QString &locale);
+    void language(const QUrl &context, const QLocale &locale);
 
 private:
     QScopedPointer<QQmlPreviewFileEngineHandler> m_fileEngine;
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)