diff options
author | Tim Jenssen <tim.jenssen@qt.io> | 2020-06-11 16:38:51 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-06-11 15:26:47 +0000 |
commit | 72bfea7b0176c5ce3e0afa856e54efee033c637d (patch) | |
tree | 35d4cdb93a280cdcc7f3b67f4e7f5844171f9e85 | |
parent | f652167768f105ad349833f18ee85a6dd81ae559 (diff) |
qmlpreview: set language before it starts
Task-number: QDS-2218
Change-Id: I1d9e73b1bbaf2280070a9484cefe679c048c357b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
-rw-r--r-- | src/plugins/qmldesigner/designersettings.h | 5 | ||||
-rw-r--r-- | src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h index a18bd20687..746465386d 100644 --- a/src/plugins/qmldesigner/designersettings.h +++ b/src/plugins/qmldesigner/designersettings.h @@ -25,7 +25,8 @@ #pragma once -#include <QtGlobal> +#include <qmldesignercorelib_global.h> + #include <QHash> #include <QVariant> #include <QByteArray> @@ -71,7 +72,7 @@ const char DISABLE_ITEM_LIBRARY_UPDATE_TIMER[] = "DisableItemLibraryUpdateTimer" const char LAST_USED_TRANSLATION_LANGUAGE[] = "LastUsedTranslationLanguage"; } -class DesignerSettings : public QHash<QByteArray, QVariant> +class QMLDESIGNERCORE_EXPORT DesignerSettings : public QHash<QByteArray, QVariant> { public: DesignerSettings(); diff --git a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp index 1fe99825c3..32d524f690 100644 --- a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp +++ b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewactions.cpp @@ -27,6 +27,7 @@ #include "qmlpreviewactions.h" #include <zoomaction.h> +#include <designersettings.h> #include <utils/utilsicons.h> #include <projectexplorer/projectexplorer.h> @@ -48,8 +49,8 @@ static void handleAction(const SelectionContext &context) { if (context.view()->isAttached()) { if (context.toggled()) { + QmlPreviewPlugin::setLanguageLocale(DesignerSettings::getValue(DesignerSettingsKey::LAST_USED_TRANSLATION_LANGUAGE).toString()); ProjectExplorerPlugin::runStartupProject(Constants::QML_PREVIEW_RUN_MODE); - QmlPreviewPlugin::setQmlFile(); } else { QmlPreviewPlugin::stopAllRunControls(); } |