feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlPreview: fix use an init language

Browse Source 
Change-Id: I2d2774d88a237871eaddacd18c55490e9bd953ef
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Tim Jenssen
2023-08-31 18:00:37 +02:00
parent dc78c8faa2
commit 8ae76adbf5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
View File

@@ -13,6 +13,7 @@
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qmldebug/qmldebugcommandlinearguments.h> #include <qmldebug/qmldebugcommandlinearguments.h>
#include <qmlprojectmanager/qmlmultilanguageaspect.h>
#include <qtsupport/baseqtversion.h> #include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
@@ -110,9 +111,10 @@ QmlPreviewRunner::QmlPreviewRunner(RunControl *runControl, const QmlPreviewRunne
this, [this, settings]() { this, [this, settings]() {
if (settings.zoomFactor > 0) if (settings.zoomFactor > 0)
emit zoom(settings.zoomFactor); emit zoom(settings.zoomFactor);
if (!settings.language.isEmpty()) if (auto multiLanguageAspect = QmlProjectManager::QmlMultiLanguageAspect::current()) {
emit language(settings.language); if (!multiLanguageAspect->currentLocale().isEmpty())
emit language(multiLanguageAspect->currentLocale());
}
emit ready(); emit ready();
}); });

1
src/plugins/qmlpreview/qmlpreviewruncontrol.h
View File

@@ -15,7 +15,6 @@ struct QmlPreviewRunnerSetting
QmlPreviewFileClassifier fileClassifier; QmlPreviewFileClassifier fileClassifier;
QmlPreviewFpsHandler fpsHandler; QmlPreviewFpsHandler fpsHandler;
float zoomFactor = -1.0; float zoomFactor = -1.0;
QString language;
QmlDebugTranslationClientFactoryFunction createDebugTranslationClientMethod; QmlDebugTranslationClientFactoryFunction createDebugTranslationClientMethod;
QmlPreviewRefreshTranslationFunction refreshTranslationsFunction; QmlPreviewRefreshTranslationFunction refreshTranslationsFunction;
}; };