From 2fc89375c6f79731e72d7012dc8bc179470cc572 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Mon, 20 Jul 2020 10:28:16 +0200
Subject: [PATCH] qmlproject: act on disabling multiLanguageAspect

Change-Id: I2f13090f8708a5cb46bf21fb0e855d8ca9d906e7
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
---
 src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 8ec0c29246f..a0bfa812116 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -118,6 +118,9 @@ 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());
+        } else {
+            env.unset("QT_MULTILANGUAGE_DATABASE");
+            env.unset("QT_MULTILANGUAGE_LANGUAGE");
         }
         return env;
     };