feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/qds-1.59' into 4.13

Browse Source 
Conflicts:
	src/plugins/clangformat/clangformatplugin.cpp
	src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
	src/plugins/qmldesigner/qmldesigner.qbs

Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
This commit is contained in:
Tim Jenssen
2020-06-26 15:13:07 +02:00
parent 97ac63b401 5a06305ffe
commit b8cd87dea0
123 changed files with 7677 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
View File

@@ -27,6 +27,7 @@
#include <qmlprojectmanager/qmlproject.h>
#include <qmlprojectmanager/qmlmainfileaspect.h>
#include <qmlprojectmanager/qmlmultilanguageaspect.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h>
@@ -152,10 +153,9 @@ LocalQmlPreviewSupport::LocalQmlPreviewSupport(ProjectExplorer::RunControl *runC
}
}
if (runControl->project()) {
auto multilanguageDatabaseFilePath = runControl->project()->projectDirectory().pathAppended("/multilanguage-experimental-v1.db");
if (multilanguageDatabaseFilePath.exists())
runnable.environment.set("QT_MULTILANGUAGE_DATABASE", multilanguageDatabaseFilePath.toString());
if (auto multiLanguageAspect = runControl->aspect<QmlProjectManager::QmlMultiLanguageAspect>()) {
if (!multiLanguageAspect->databaseFilePath().isEmpty())
runnable.environment.set("QT_MULTILANGUAGE_DATABASE", multiLanguageAspect->databaseFilePath().toString());
}
Utils::QtcProcess::addArg(&runnable.commandLineArguments,