diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp
index 7525fbf160d..0e24f6dcba7 100644
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -1727,7 +1727,7 @@ QString ClangdClient::displayNameFromDocumentSymbol(SymbolKind kind, const QStri
 void ClangdClient::handleUiHeaderChange(const QString &fileName)
 {
     const QRegularExpression includeRex("#include.*" + fileName + R"([>"])");
-    const QVector<Client *> &allClients = LanguageClientManager::clients();
+    const QList<Client *> &allClients = LanguageClientManager::clients();
     for (Client * const client : allClients) {
         if (!client->reachable() || !qobject_cast<ClangdClient *>(client))
             continue;
diff --git a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp
index 6aa5d1e9703..dd15db149d2 100644
--- a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp
+++ b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp
@@ -157,7 +157,7 @@ ClangGlobalSymbolFilter::~ClangGlobalSymbolFilter()
 void ClangGlobalSymbolFilter::prepareSearch(const QString &entry)
 {
     m_cppFilter->prepareSearch(entry);
-    QVector<LanguageClient::Client *> clients;
+    QList<LanguageClient::Client *> clients;
     for (ProjectExplorer::Project * const project : ProjectExplorer::SessionManager::projects()) {
         LanguageClient::Client * const client
                 = ClangModelManagerSupport::instance()->clientForProject(project);
diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp
index 762bac6e49f..94684c1ca6d 100644
--- a/src/plugins/languageclient/languageclientmanager.cpp
+++ b/src/plugins/languageclient/languageclientmanager.cpp
@@ -189,7 +189,7 @@ Client *LanguageClientManager::startClient(BaseSettings *setting, ProjectExplore
     return client;
 }
 
-QVector<Client *> LanguageClientManager::clients()
+QList<Client *> LanguageClientManager::clients()
 {
     QTC_ASSERT(managerInstance, return {});
     return managerInstance->m_clients;
@@ -233,7 +233,7 @@ void LanguageClientManager::deleteClient(Client *client)
     qCDebug(Log) << "delete client: " << client->name() << client;
     client->disconnect(managerInstance);
     managerInstance->m_clients.removeAll(client);
-    for (QVector<Client *> &clients : managerInstance->m_clientsForSetting)
+    for (QList<Client *> &clients : managerInstance->m_clientsForSetting)
         clients.removeAll(client);
     if (managerInstance->m_shuttingDown) {
         delete client;
@@ -272,7 +272,7 @@ QList<Client *> LanguageClientManager::clientsSupportingDocument(const TextEdito
     QTC_ASSERT(doc, return {};);
     return Utils::filtered(managerInstance->reachableClients(), [doc](Client *client) {
         return client->isSupportedDocument(doc);
-    }).toList();
+    });
 }
 
 void LanguageClientManager::applySettings()
@@ -286,7 +286,7 @@ void LanguageClientManager::applySettings()
 
     for (BaseSettings *setting : restarts) {
         QList<TextEditor::TextDocument *> documents;
-        const QVector<Client *> currentClients = clientForSetting(setting);
+        const QList<Client *> currentClients = clientForSetting(setting);
         for (Client *client : currentClients) {
             documents << managerInstance->m_clientForDocument.keys(client);
             shutdownClient(client);
@@ -367,7 +367,7 @@ void LanguageClientManager::enableClientSettings(const QString &settingsId)
     managerInstance->applySettings();
 }
 
-QVector<Client *> LanguageClientManager::clientForSetting(const BaseSettings *setting)
+QList<Client *> LanguageClientManager::clientForSetting(const BaseSettings *setting)
 {
     QTC_ASSERT(managerInstance, return {});
     auto instance = managerInstance;
@@ -414,7 +414,7 @@ const QList<Client *> LanguageClientManager::clientsForProject(
 {
     return Utils::filtered(managerInstance->m_clients, [project](const Client *c) {
         return c->project() == project;
-    }).toList();
+    });
 }
 
 void LanguageClientManager::openDocumentWithClient(TextEditor::TextDocument *document, Client *client)
@@ -455,7 +455,7 @@ void LanguageClientManager::showInspector()
     inspectorWidget->show();
 }
 
-QVector<Client *> LanguageClientManager::reachableClients()
+QList<Client *> LanguageClientManager::reachableClients()
 {
     return Utils::filtered(m_clients, &Client::reachable);
 }
@@ -506,7 +506,7 @@ void LanguageClientManager::documentOpened(Core::IDocument *document)
     for (BaseSettings *setting : settings) {
         if (setting->isValid() && setting->m_enabled
             && setting->m_languageFilter.isSupported(document)) {
-            QVector<Client *> clients = clientForSetting(setting);
+            QList<Client *> clients = clientForSetting(setting);
             if (setting->m_startBehavior == BaseSettings::RequiresProject) {
                 const Utils::FilePath &filePath = document->filePath();
                 for (ProjectExplorer::Project *project :
@@ -548,7 +548,7 @@ void LanguageClientManager::documentClosed(Core::IDocument *document)
 void LanguageClientManager::documentContentsSaved(Core::IDocument *document)
 {
     if (auto textDocument = qobject_cast<TextEditor::TextDocument *>(document)) {
-        const QVector<Client *> &clients = reachableClients();
+        const QList<Client *> &clients = reachableClients();
         for (Client *client : clients)
             client->documentContentsSaved(textDocument);
     }
@@ -557,7 +557,7 @@ void LanguageClientManager::documentContentsSaved(Core::IDocument *document)
 void LanguageClientManager::documentWillSave(Core::IDocument *document)
 {
     if (auto textDocument = qobject_cast<TextEditor::TextDocument *>(document)) {
-        const QVector<Client *> &clients = reachableClients();
+        const QList<Client *> &clients = reachableClients();
         for (Client *client : clients)
             client->documentWillSave(textDocument);
     }
@@ -598,7 +598,7 @@ void LanguageClientManager::projectAdded(ProjectExplorer::Project *project)
     connect(project, &ProjectExplorer::Project::fileListChanged, this, [this, project]() {
         updateProject(project);
     });
-    const QVector<Client *> &clients = reachableClients();
+    const QList<Client *> &clients = reachableClients();
     for (Client *client : clients)
         client->projectOpened(project);
 }
diff --git a/src/plugins/languageclient/languageclientmanager.h b/src/plugins/languageclient/languageclientmanager.h
index e585d0dd8c6..77f8446e38c 100644
--- a/src/plugins/languageclient/languageclientmanager.h
+++ b/src/plugins/languageclient/languageclientmanager.h
@@ -62,7 +62,7 @@ public:
     static void clientStarted(Client *client);
     static void clientFinished(Client *client);
     static Client *startClient(BaseSettings *setting, ProjectExplorer::Project *project = nullptr);
-    static QVector<Client *> clients();
+    static QList<Client *> clients();
     static void addClient(Client *client);
 
     static void addExclusiveRequest(const LanguageServerProtocol::MessageId &id, Client *client);
@@ -81,7 +81,7 @@ public:
     static QList<BaseSettings *> currentSettings();
     static void registerClientSettings(BaseSettings *settings);
     static void enableClientSettings(const QString &settingsId);
-    static QVector<Client *> clientForSetting(const BaseSettings *setting);
+    static QList<Client *> clientForSetting(const BaseSettings *setting);
     static const BaseSettings *settingForClient(Client *setting);
     static Client *clientForDocument(TextEditor::TextDocument *document);
     static Client *clientForFilePath(const Utils::FilePath &filePath);
@@ -117,12 +117,12 @@ private:
     void updateProject(ProjectExplorer::Project *project);
     void projectAdded(ProjectExplorer::Project *project);
 
-    QVector<Client *> reachableClients();
+    QList<Client *> reachableClients();
 
     bool m_shuttingDown = false;
-    QVector<Client *> m_clients;
+    QList<Client *> m_clients;
     QList<BaseSettings *>  m_currentSettings; // owned
-    QMap<QString, QVector<Client *>> m_clientsForSetting;
+    QMap<QString, QList<Client *>> m_clientsForSetting;
     QHash<TextEditor::TextDocument *, QPointer<Client>> m_clientForDocument;
     QHash<LanguageServerProtocol::MessageId, QList<Client *>> m_exclusiveRequests;
     DocumentLocatorFilter m_currentDocumentLocatorFilter;
diff --git a/src/plugins/languageclient/locatorfilter.cpp b/src/plugins/languageclient/locatorfilter.cpp
index e7a6aed4e98..6474ef9ef26 100644
--- a/src/plugins/languageclient/locatorfilter.cpp
+++ b/src/plugins/languageclient/locatorfilter.cpp
@@ -253,13 +253,13 @@ void WorkspaceLocatorFilter::prepareSearch(const QString &entry)
     prepareSearch(entry, LanguageClientManager::clients(), false);
 }
 
-void WorkspaceLocatorFilter::prepareSearch(const QString &entry, const QVector<Client *> &clients)
+void WorkspaceLocatorFilter::prepareSearch(const QString &entry, const QList<Client *> &clients)
 {
     prepareSearch(entry, clients, true);
 }
 
 void WorkspaceLocatorFilter::prepareSearch(const QString &entry,
-                                           const QVector<Client *> &clients,
+                                           const QList<Client *> &clients,
                                            bool force)
 {
     m_pendingRequests.clear();
diff --git a/src/plugins/languageclient/locatorfilter.h b/src/plugins/languageclient/locatorfilter.h
index c149fadcad0..8fe57dcd268 100644
--- a/src/plugins/languageclient/locatorfilter.h
+++ b/src/plugins/languageclient/locatorfilter.h
@@ -100,7 +100,7 @@ public:
     /// request workspace symbols for all clients with enabled locator
     void prepareSearch(const QString &entry) override;
     /// force request workspace symbols for all given clients
-    void prepareSearch(const QString &entry, const QVector<Client *> &clients);
+    void prepareSearch(const QString &entry, const QList<Client *> &clients);
     QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future,
                                                const QString &entry) override;
     void accept(const Core::LocatorFilterEntry &selection,
@@ -117,7 +117,7 @@ protected:
     void setMaxResultCount(qint64 limit) { m_maxResultCount = limit; }
 
 private:
-    void prepareSearch(const QString &entry, const QVector<Client *> &clients, bool force);
+    void prepareSearch(const QString &entry, const QList<Client *> &clients, bool force);
     void handleResponse(Client *client,
                         const LanguageServerProtocol::WorkspaceSymbolRequest::Response &response);
 
diff --git a/src/plugins/python/pythonlanguageclient.cpp b/src/plugins/python/pythonlanguageclient.cpp
index bef1aea80e1..593dbc080bb 100644
--- a/src/plugins/python/pythonlanguageclient.cpp
+++ b/src/plugins/python/pythonlanguageclient.cpp
@@ -442,7 +442,7 @@ bool PyLSSettings::applyFromSettingsWidget(QWidget *widget)
     if (m_configuration != pylswidget->configuration()) {
         m_configuration = pylswidget->configuration();
         if (!changed) { // if only the settings configuration changed just send an update
-            const QVector<Client *> clients = LanguageClientManager::clientForSetting(this);
+            const QList<Client *> clients = LanguageClientManager::clientForSetting(this);
             for (Client *client : clients)
                 client->updateConfiguration(configuration());
         }