From f0bcc1e96a69ee2b23887c73ce2746334ae33751 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 20 May 2020 04:35:18 +0200 Subject: [PATCH] qmlpreview: add QT_MULTILANGUAGE_DATABASE feature Change-Id: If6d1d95eb994eea5fe801a3aa5e7343f7764b2a0 Reviewed-by: Tim Jenssen --- .../qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp | 2 +- src/plugins/qmlpreview/qmlpreviewruncontrol.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp index 2e7186db0d0..aa6b0e85652 100644 --- a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp +++ b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp @@ -152,7 +152,7 @@ void QmlPreviewPlugin::setZoomFactor(float zoomFactor) void QmlPreviewPlugin::setLanguageLocale(const QString &locale) { - if (s_previewPlugin) + if (auto s_previewPlugin = getPreviewPlugin()) s_previewPlugin->setProperty("locale", locale); } diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp index 9f22796689e..2dd822fa4e0 100644 --- a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp +++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp @@ -151,6 +151,12 @@ LocalQmlPreviewSupport::LocalQmlPreviewSupport(ProjectExplorer::RunControl *runC runnable.setCommandLine(commandLine); } + if (runControl->project()) { + auto multilanguageDatabaseFilePath = runControl->project()->projectDirectory().pathAppended("/multilanguage-experimental-v1.db"); + if (multilanguageDatabaseFilePath.exists()) + runnable.environment.set("QT_MULTILANGUAGE_DATABASE", multilanguageDatabaseFilePath.toString()); + } + Utils::QtcProcess::addArg(&runnable.commandLineArguments, QmlDebug::qmlDebugLocalArguments(QmlDebug::QmlPreviewServices, serverUrl.path()));