From 57e77ec44918766beea31e6a243f0e33cfd08e96 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 14 Oct 2020 14:02:49 +0200 Subject: [PATCH] qmlpreview: fix calling right localeIsoCode method Also add some QTC_CHECK to get at least some warning in case the functions are renamed in future. Change-Id: Ie4e78855152e9946950603c95fa881755e850c62 Reviewed-by: Marco Bubke (cherry picked from commit 165ccb828d5f741c91ebdc0bf6e50bd980497640) Reviewed-by: Tim Jenssen --- .../qmlpreviewplugin/qmlpreviewplugin.cpp | 20 +++++++++++++------ .../qmlmultilanguageaspect.cpp | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp index ac0f30118d5..e0d55eb21a1 100644 --- a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp +++ b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp @@ -84,7 +84,9 @@ QmlPreviewPlugin::QmlPreviewPlugin() if (s_previewPlugin) { auto fpsAction = new FpsAction; designerActionManager.addDesignerAction(fpsAction); - s_previewPlugin->setProperty("fpsHandler", QVariant::fromValue(FpsLabelAction::fpsHandler)); + bool hasFpsHandler = + s_previewPlugin->setProperty("fpsHandler", QVariant::fromValue(FpsLabelAction::fpsHandler)); + QTC_CHECK(hasFpsHandler); auto switchLanguageAction = new SwitchLanguageAction; designerActionManager.addDesignerAction(switchLanguageAction); } @@ -132,7 +134,9 @@ void QmlPreviewPlugin::setQmlFile() if (s_previewPlugin) { const Utils::FilePath qmlFileName = QmlDesignerPlugin::instance()->currentDesignDocument()->fileName(); - s_previewPlugin->setProperty("previewedFile", qmlFileName.toString()); + bool hasPreviewedFile = + s_previewPlugin->setProperty("previewedFile", qmlFileName.toString()); + QTC_CHECK(hasPreviewedFile); } } @@ -146,14 +150,18 @@ float QmlPreviewPlugin::zoomFactor() void QmlPreviewPlugin::setZoomFactor(float zoomFactor) { - if (s_previewPlugin) - s_previewPlugin->setProperty("zoomFactor", zoomFactor); + if (s_previewPlugin) { + bool hasZoomFactor = s_previewPlugin->setProperty("zoomFactor", zoomFactor); + QTC_CHECK(hasZoomFactor); + } } void QmlPreviewPlugin::setLanguageLocale(const QString &locale) { - if (auto s_previewPlugin = getPreviewPlugin()) - s_previewPlugin->setProperty("locale", locale); + if (auto s_previewPlugin = getPreviewPlugin()) { + bool hasLocaleIsoCode = s_previewPlugin->setProperty("localeIsoCode", locale); + QTC_CHECK(hasLocaleIsoCode); + } } QObject *QmlPreviewPlugin::getPreviewPlugin() diff --git a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp index 8e9654033b9..c2de9927627 100644 --- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp @@ -95,7 +95,7 @@ void QmlMultiLanguageAspect::setCurrentLocale(const QString &locale) return; m_currentLocale = locale; if (auto previewPlugin = getPreviewPlugin()) - previewPlugin->setProperty("locale", locale); + previewPlugin->setProperty("localeIsoCode", locale); } QString QmlMultiLanguageAspect::currentLocale() const