Merge remote-tracking branch 'origin/15.0'

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/plugins/languageclient/languageclientmanager.cpp
	src/plugins/languageclient/languageclientmanager.h

Change-Id: I5d705abb1dd6b67e7c51c4f9151bf4fe3213004f

1 files changed, 11 insertions, 1 deletions

diff --git a/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp b/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
index 52b130c1d60..e9a56867155 100644
--- a/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
+++ b/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
@@ -308,7 +308,17 @@ public:
         if (m_aspects) {
             connect(m_aspects, &AspectContainer::applied, this, [this] {
                 updateOptions();
-                LanguageClientManager::applySettings();
+                auto settings = Utils::findOr(
+                    LanguageClientManager::currentSettings(), nullptr, [this](BaseSettings *s) {
+                        return s->m_id == m_clientSettingsId;
+                    });
+
+                if (settings) {
+                    LanguageClientManager::applySettings(settings);
+                    LanguageClientManager::writeSettings();
+                } else {
+                    LanguageClientManager::applySettings();
+                }
             });
         }