diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-07-20 20:45:08 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-07-23 09:14:31 +0000 |
| commit | bde420f7b7373ad5602ce80383cfe4db6602aa6d (patch) | |
| tree | fbc8e6bb4773559d2c6e2e2b904fa62fa658712d /src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp | |
| parent | 03307d8cb4ecc15f4bf1ac5c7424b35ef7b1a7cf (diff) | |
qmlproject: rename lastUsedLanguage -> currentLocale
removed the connection from plugin to
QmlMultiLanguageAspect::setCurrentLocale
but calling it directly in QmlPreviewPlugin::setLocale
Does not matter which method is called it will change the right
thing only once because it is checking if it already have the
set locale.
Change-Id: I6cb4b115788adc103481dcda45e3214a0cd73401
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 2f491e8f6be..063a2d1e7d0 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -547,7 +547,7 @@ void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node, } else if (node.isRootNode() && name == "language@Internal") { const QString languageAsString = value.toString(); if (auto multiLanguageAspect = QmlProjectManager::QmlMultiLanguageAspect::current(m_currentTarget)) - multiLanguageAspect->setLastUsedLanguage(languageAsString); + multiLanguageAspect->setCurrentLocale(languageAsString); nodeInstanceServer()->changeLanguage({languageAsString}); } else if (node.isRootNode() && name == "previewSize@Internal") { nodeInstanceServer()->changePreviewImageSize(value.toSize()); @@ -991,7 +991,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand() QString lastUsedLanguage; if (auto multiLanguageAspect = QmlProjectManager::QmlMultiLanguageAspect::current(m_currentTarget)) - lastUsedLanguage = multiLanguageAspect->lastUsedLanguage(); + lastUsedLanguage = multiLanguageAspect->currentLocale(); return CreateSceneCommand( instanceContainerList, |