Merge remote-tracking branch 'origin/7.0'

 Conflicts:
	src/plugins/android/androiddevice.cpp
	src/plugins/docker/dockerdevice.cpp

Change-Id: Id16ba0d9993c9f608242622aceae0a2a6691e05e

1 files changed, 4 insertions, 4 deletions

diff --git a/src/libs/languageserverprotocol/servercapabilities.cpp b/src/libs/languageserverprotocol/servercapabilities.cpp
index 8e2dc530539..dd2b7628eb1 100644
--- a/src/libs/languageserverprotocol/servercapabilities.cpp
+++ b/src/libs/languageserverprotocol/servercapabilities.cpp
@@ -281,11 +281,11 @@ Utils::optional<Utils::variant<QString, bool> >
 ServerCapabilities::WorkspaceServerCapabilities::WorkspaceFoldersCapabilities::changeNotifications() const
 {
     using RetType = Utils::variant<QString, bool>;
-    const QJsonValue &provider = value(implementationProviderKey);
-    if (provider.isUndefined())
+    const QJsonValue &change = value(changeNotificationsKey);
+    if (change.isUndefined())
         return Utils::nullopt;
-    return Utils::make_optional(provider.isBool() ? RetType(provider.toBool())
-                                                  : RetType(provider.toString()));
+    return Utils::make_optional(change.isBool() ? RetType(change.toBool())
+                                                : RetType(change.toString()));
 }
 
 void ServerCapabilities::WorkspaceServerCapabilities::WorkspaceFoldersCapabilities::setChangeNotifications(