From 8ae76adbf568a3d84e6016c5fb91dcb357e7b28f Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Thu, 31 Aug 2023 18:00:37 +0200
Subject: [PATCH] QmlPreview: fix use an init language

Change-Id: I2d2774d88a237871eaddacd18c55490e9bd953ef
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
---
 src/plugins/qmlpreview/qmlpreviewruncontrol.cpp | 8 +++++---
 src/plugins/qmlpreview/qmlpreviewruncontrol.h   | 1 -
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
index 2969e2aa3f6..3d776cb33ff 100644
--- a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
+++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
@@ -13,6 +13,7 @@
 #include <projectexplorer/target.h>
 
 #include <qmldebug/qmldebugcommandlinearguments.h>
+#include <qmlprojectmanager/qmlmultilanguageaspect.h>
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
 
@@ -110,9 +111,10 @@ QmlPreviewRunner::QmlPreviewRunner(RunControl *runControl, const QmlPreviewRunne
             this, [this, settings]() {
         if (settings.zoomFactor > 0)
             emit zoom(settings.zoomFactor);
-        if (!settings.language.isEmpty())
-            emit language(settings.language);
-
+        if (auto multiLanguageAspect = QmlProjectManager::QmlMultiLanguageAspect::current()) {
+            if (!multiLanguageAspect->currentLocale().isEmpty())
+                emit language(multiLanguageAspect->currentLocale());
+        }
         emit ready();
     });
 
diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.h b/src/plugins/qmlpreview/qmlpreviewruncontrol.h
index 8512826280f..d1fbdb88d1c 100644
--- a/src/plugins/qmlpreview/qmlpreviewruncontrol.h
+++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.h
@@ -15,7 +15,6 @@ struct QmlPreviewRunnerSetting
     QmlPreviewFileClassifier fileClassifier;
     QmlPreviewFpsHandler fpsHandler;
     float zoomFactor = -1.0;
-    QString language;
     QmlDebugTranslationClientFactoryFunction createDebugTranslationClientMethod;
     QmlPreviewRefreshTranslationFunction refreshTranslationsFunction;
 };