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 
Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
This commit is contained in:
Tim Jenssen
2020-08-13 08:34:24 +02:00
parent 24ca17f714 dc870f538d
commit 4fe5b923cd
93 changed files with 3704 additions and 1066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -117,7 +117,10 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id)
if (m_multiLanguageAspect && m_multiLanguageAspect->value() && !m_multiLanguageAspect->databaseFilePath().isEmpty()) {
env.set("QT_MULTILANGUAGE_DATABASE", m_multiLanguageAspect->databaseFilePath().toString());
env.set("QT_MULTILANGUAGE_LANGUAGE", m_multiLanguageAspect->lastUsedLanguage());
env.set("QT_MULTILANGUAGE_LANGUAGE", m_multiLanguageAspect->currentLocale());
} else {
env.unset("QT_MULTILANGUAGE_DATABASE");
env.unset("QT_MULTILANGUAGE_LANGUAGE");
}
return env;
};