Merge remote-tracking branch 'origin/4.13' into 4.14

Change-Id: If549dd1bc610704ece881c408cf44192dabed8b9
This commit is contained in:
Eike Ziller
2020-10-19 14:10:51 +02:00
4 changed files with 42 additions and 14 deletions

View File

@@ -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