Avoid potential detach of non-const Qt containers in range-loops 1/2

By making the containers const.

Change-Id: I3095d7c817bd8a9cc40184aba144d617c6071f97
Reviewed-by: hjk <[email protected]>

46 files changed, 64 insertions, 61 deletions

diff --git a/src/libs/qmljs/qmljsbind.cpp b/src/libs/qmljs/qmljsbind.cpp
index 163680998f1..61b8b0a7b40 100644
--- a/src/libs/qmljs/qmljsbind.cpp
+++ b/src/libs/qmljs/qmljsbind.cpp
@@ -89,7 +89,7 @@ bool Bind::usesQmlPrototype(ObjectValue *prototype,
     if (componentName.isEmpty())
         return false;
 
-    QList<const ObjectValue *> values = _qmlObjectsByPrototypeName.values(componentName);
+    const QList<const ObjectValue *> values = _qmlObjectsByPrototypeName.values(componentName);
     for (const ObjectValue *object : values) {
         // resolve and check the prototype
         const ObjectValue *resolvedPrototype = object->prototype(context);
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index 2aa27fe58e6..b5cef105e9f 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -716,16 +716,16 @@ Check::Check(Document::Ptr doc, const ContextPtr &context, Utils::QtcSettings *q
         auto toIntList = [](const QList<StaticAnalysis::Type> list) {
             return Utils::transform(list, [](StaticAnalysis::Type t) { return int(t); });
         };
-        auto disabled = qtcSettings->value("J.QtQuick/QmlJSEditor.disabledMessages",
-                                           QVariant::fromValue(
-                                               toIntList(defaultDisabledMessages()))).toList();
+        const auto disabled = qtcSettings->value("J.QtQuick/QmlJSEditor.disabledMessages",
+                                                 QVariant::fromValue(
+                                                     toIntList(defaultDisabledMessages()))).toList();
         for (const QVariant &disabledNumber : disabled)
             disableMessage(StaticAnalysis::Type(disabledNumber.toInt()));
 
         if (!isQtQuick2Ui()) {
-            auto disabled = qtcSettings->value("J.QtQuick/QmlJSEditor.disabledMessagesNonQuickUI",
-                                               QVariant::fromValue(
-                                                   toIntList(defaultDisabledMessagesForNonQuickUi()))).toList();
+            const auto disabled = qtcSettings->value("J.QtQuick/QmlJSEditor.disabledMessagesNonQuickUI",
+                                                     QVariant::fromValue(
+                                                         toIntList(defaultDisabledMessagesForNonQuickUi()))).toList();
             for (const QVariant &disabledNumber : disabled)
                 disableMessage(StaticAnalysis::Type(disabledNumber.toInt()));
         }
diff --git a/src/libs/qmljs/qmljsicons.cpp b/src/libs/qmljs/qmljsicons.cpp
index fcd767bdaac..b6ffe72c5b5 100644
--- a/src/libs/qmljs/qmljsicons.cpp
+++ b/src/libs/qmljs/qmljsicons.cpp
@@ -46,14 +46,14 @@ IconsStorage::IconsStorage()
     if (debug)
         qCDebug(iconsLog) << "parsing" << iconsPath;
     QDir topDir(iconsPath);
-    QList<QFileInfo> dirs = topDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+    const QFileInfoList dirs = topDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
     for (const QFileInfo &subDirInfo : dirs) {
         if (debug)
             qCDebug(iconsLog) << "parsing" << subDirInfo.absoluteFilePath();
         const QString packageName = subDirInfo.fileName();
         m_packageNames.append(packageName);
         QDir subDir(subDirInfo.absoluteFilePath() + QLatin1String("/16x16"));
-        QList<QFileInfo> files = subDir.entryInfoList(QDir::Files);
+        const QFileInfoList files = subDir.entryInfoList(QDir::Files);
         for (const QFileInfo &iconFile : files) {
             QIcon icon(iconFile.absoluteFilePath());
             if (icon.isNull()) {
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp
index f3fc4614e46..fd45a8a649f 100644
--- a/src/libs/qmljs/qmljslink.cpp
+++ b/src/libs/qmljs/qmljslink.cpp
@@ -418,7 +418,7 @@ Import LinkPrivate::importNonFile(const Document::Ptr &doc, const ImportInfo &im
     const QString packageName = importInfo.name();
     const ComponentVersion version = importInfo.version();
 
-    QList<Utils::FilePath> libraryPaths = modulePaths(packageName,
+    const Utils::FilePaths libraryPaths = modulePaths(packageName,
                                                       version.toString(),
                                                       m_importPaths + m_applicationDirectories);
 
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
index 014ff0909da..528d38daee1 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
@@ -1813,7 +1813,7 @@ Utils::FilePath ModelManagerInterface::fileToSource(const Utils::FilePath &path)
     if (!path.scheme().isEmpty())
         return path;
 
-    QList<Utils::FilePath> applicationPaths = m_syncedData.readLocked()->m_applicationPaths;
+    const Utils::FilePaths applicationPaths = m_syncedData.readLocked()->m_applicationPaths;
 
     for (const Utils::FilePath &p : applicationPaths) {
         if (!p.isEmpty() && path.startsWith(p.path())) {
diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index 119910dc08d..26f000cb260 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -3586,7 +3586,7 @@ void AspectList::fromMap(const Utils::Store &map)
 {
     QTC_ASSERT(!settingsKey().isEmpty(), return);
 
-    QVariantList list = map[settingsKey()].toList();
+    const QVariantList list = map[settingsKey()].toList();
     d->volatileItems.clear();
     for (const QVariant &entry : list) {
         auto item = d->createItem();
diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp
index d19fb8f85d0..83618487eaa 100644
--- a/src/libs/utils/stringutils.cpp
+++ b/src/libs/utils/stringutils.cpp
@@ -92,7 +92,7 @@ QTCREATOR_UTILS_EXPORT bool readMultiLineString(const QJsonValue &value, QString
     if (value.isString()) {
         *out = value.toString();
     } else if (value.isArray()) {
-        QJsonArray array = value.toArray();
+        const QJsonArray array = value.toArray();
         QStringList lines;
         for (const QJsonValue &v : array) {
             if (!v.isString())
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index 0961c6e47ac..c065a3b1ad2 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -145,7 +145,7 @@ static FilePath clangPlusPlusPath(const FilePath &clangPath)
 
 static FilePaths uniqueNdksForCurrentQtVersions()
 {
-    auto androidQtVersions = QtSupport::QtVersionManager::versions(
+    const QtSupport::QtVersions androidQtVersions = QtSupport::QtVersionManager::versions(
         &QtSupport::QtVersion::isAndroidQtVersion);
 
     FilePaths uniqueNdks;
diff --git a/src/plugins/clangcodemodel/clangdcompletion.cpp b/src/plugins/clangcodemodel/clangdcompletion.cpp
index c485cef860e..398c43881f8 100644
--- a/src/plugins/clangcodemodel/clangdcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangdcompletion.cpp
@@ -474,7 +474,7 @@ void ClangdCompletionItem::apply(TextEditorWidget *editorWidget,
             editorWidget->setAutoCompleteSkipPosition(editorWidget->textCursor());
     }
 
-    if (auto additionalEdits = item.additionalTextEdits()) {
+    if (const auto additionalEdits = item.additionalTextEdits()) {
         for (const auto &edit : *additionalEdits)
             applyTextEdit(editorWidget, edit);
     }
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index ce52d8c4c0a..82ad3052288 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -1329,7 +1329,7 @@ static void addCMakeConfigurePresetToInitialArguments(QStringList &initialArgume
                 // Remove the expanded Qt path from the presets values
                 QString argItemExpandedValue = argItem.expandedValue(k);
                 presetValueList.removeIf([argItemExpandedValue](const QString &presetPath) {
-                    QStringList argItemPaths = argItemExpandedValue.split(";");
+                    const QStringList argItemPaths = argItemExpandedValue.split(";");
                     for (const QString &argPath : argItemPaths) {
                         const FilePath argFilePath = FilePath::fromString(argPath);
                         const FilePath presetFilePath = FilePath::fromUserInput(presetPath);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 8187d25dc86..b3cee265e71 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -1487,7 +1487,7 @@ void CMakeBuildSystem::updateProjectData()
             FilePath moduleMapFile = buildConfiguration()->buildDirectory()
                     .pathAppended("qml_module_mappings/" + rpp.buildSystemTarget);
             if (expected_str<QByteArray> content = moduleMapFile.fileContents()) {
-                auto lines = content->split('\n');
+                const QList<QByteArray> lines = content->split('\n');
                 for (const QByteArray &line : lines) {
                     if (!line.isEmpty())
                         moduleMappings.append(line.simplified());
diff --git a/src/plugins/coco/globalsettings.cpp b/src/plugins/coco/globalsettings.cpp
index ecd3514430f..fadaccc982e 100644
--- a/src/plugins/coco/globalsettings.cpp
+++ b/src/plugins/coco/globalsettings.cpp
@@ -130,7 +130,7 @@ bool CocoSettings::verifyCocoDirectory(const FilePath &cocoDir)
 
     QString result = QString::fromLatin1(proc.readAll());
     static const QRegularExpression linebreak("\n|\r\n|\r");
-    QStringList lines = result.split(linebreak, Qt::SkipEmptyParts);
+    const QStringList lines = result.split(linebreak, Qt::SkipEmptyParts);
 
     const qsizetype n = lines.size();
     if (n >= 2 && lines[n - 2].startsWith("Version:") && lines[n - 1].startsWith("Date:")) {
diff --git a/src/plugins/compilerexplorer/api/compile.h b/src/plugins/compilerexplorer/api/compile.h
index 8caefff83bc..82f70e26957 100644
--- a/src/plugins/compilerexplorer/api/compile.h
+++ b/src/plugins/compilerexplorer/api/compile.h
@@ -272,7 +272,7 @@ struct CompileResult : CompilerResult
         {
             AssemblyLine line;
             line.text = object["text"].toString();
-            auto opcodes = object["opcodes"].toArray();
+            const QJsonArray opcodes = object["opcodes"].toArray();
             for (const auto &opcode : opcodes)
                 line.opcodes.append(opcode.toString());
 
diff --git a/src/plugins/compilerexplorer/api/compiler.cpp b/src/plugins/compilerexplorer/api/compiler.cpp
index 55780234491..6b9223d8681 100644
--- a/src/plugins/compilerexplorer/api/compiler.cpp
+++ b/src/plugins/compilerexplorer/api/compiler.cpp
@@ -33,7 +33,7 @@ QFuture<Compilers> compilers(const Config &config,
         url.setQuery(QUrlQuery{{"fields", fieldParam}});
 
     auto fromJson = [extraFields](const QJsonDocument &doc) {
-        QJsonArray compilers = doc.array();
+        const QJsonArray compilers = doc.array();
         Compilers result;
 
         for (const auto &compiler : compilers) {
diff --git a/src/plugins/compilerexplorer/api/language.cpp b/src/plugins/compilerexplorer/api/language.cpp
index aa162390b1c..3448bc542b5 100644
--- a/src/plugins/compilerexplorer/api/language.cpp
+++ b/src/plugins/compilerexplorer/api/language.cpp
@@ -15,7 +15,7 @@ QFuture<Languages> languages(const Config &config)
     url.setQuery(QUrlQuery{{"fields", "id,name,extensions,logoUrl"}});
 
     return jsonRequest<Languages>(config.networkManager, url, [](const QJsonDocument &doc) {
-        QJsonArray languages = doc.array();
+        const QJsonArray languages = doc.array();
         Languages result;
         for (const auto &language : languages) {
             QJsonObject obj = language.toObject();
@@ -23,7 +23,7 @@ QFuture<Languages> languages(const Config &config)
             l.id = obj["id"].toString();
             l.name = obj["name"].toString();
             l.logoUrl = obj["logoUrl"].toString();
-            QJsonArray extensions = obj["extensions"].toArray();
+            const QJsonArray extensions = obj["extensions"].toArray();
             for (const auto &extension : extensions) {
                 l.extensions.append(extension.toString());
             }
diff --git a/src/plugins/compilerexplorer/api/library.cpp b/src/plugins/compilerexplorer/api/library.cpp
index 579074811e4..c95f7f4ef8c 100644
--- a/src/plugins/compilerexplorer/api/library.cpp
+++ b/src/plugins/compilerexplorer/api/library.cpp
@@ -18,7 +18,7 @@ QFuture<Libraries> libraries(const Config &config, const QString &languageId)
     const QUrl url = config.url({"api/libraries", languageId});
 
     return jsonRequest<Libraries>(config.networkManager, url, [](const QJsonDocument &doc) {
-        QJsonArray libraries = doc.array();
+        const QJsonArray libraries = doc.array();
         Libraries result;
 
         for (const auto &library : libraries) {
@@ -28,7 +28,7 @@ QFuture<Libraries> libraries(const Config &config, const QString &languageId)
             l.name = obj["name"].toString();
             l.url = QUrl::fromUserInput(obj["url"].toString());
 
-            QJsonArray versions = obj["versions"].toArray();
+            const QJsonArray versions = obj["versions"].toArray();
             for (const auto &version : versions) {
                 l.versions.append({
                     version.toObject()["version"].toString(),
diff --git a/src/plugins/compilerexplorer/compilerexplorersettings.cpp b/src/plugins/compilerexplorer/compilerexplorersettings.cpp
index 13c84159d8e..90ae55619fb 100644
--- a/src/plugins/compilerexplorer/compilerexplorersettings.cpp
+++ b/src/plugins/compilerexplorer/compilerexplorersettings.cpp
@@ -284,7 +284,7 @@ void CompilerSettings::fillCompilerModel(const Utils::StringSelectionAspect::Res
                      this,
                      [watcher, this, fillFromCache]() {
                          try {
-                             auto result = watcher->result();
+                             const auto result = watcher->result();
                              auto itCache = cachedCompilers().insert(m_languageId, {});
 
                              for (const Api::Compiler &compiler : result)
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index e29ffa5978f..3a4f0f1ec3d 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -3603,7 +3603,7 @@ QByteArray EditorManager::saveState()
     stream << QByteArray("EditorManagerV5");
 
     // TODO: In case of split views it's not possible to restore these for all correctly with this
-    QList<IDocument *> documents = DocumentModel::openedDocuments();
+    const QList<IDocument *> documents = DocumentModel::openedDocuments();
     for (IDocument *document : documents) {
         if (!document->filePath().isEmpty() && !document->isTemporary()) {
             IEditor *editor = DocumentModel::editorsForDocument(document).constFirst();
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp
index 3aadb0356aa..3b29e9553f6 100644
--- a/src/plugins/coreplugin/modemanager.cpp
+++ b/src/plugins/coreplugin/modemanager.cpp
@@ -110,7 +110,7 @@ void ModeManagerPrivate::showMenu(int index, QMouseEvent *event)
         QTC_ASSERT(viewContainer, return);
         QMenu *viewMenu = viewContainer->menu();
         QTC_ASSERT(viewMenu, return);
-        QList<QAction *> actions = viewMenu->actions();
+        const QList<QAction *> actions = viewMenu->actions();
         if (actions.isEmpty())
             return;
         auto menu = new QMenu(m_actionBar);
diff --git a/src/plugins/coreplugin/sidebarwidget.cpp b/src/plugins/coreplugin/sidebarwidget.cpp
index 67a8037934a..4da23416234 100644
--- a/src/plugins/coreplugin/sidebarwidget.cpp
+++ b/src/plugins/coreplugin/sidebarwidget.cpp
@@ -117,7 +117,7 @@ void SideBarWidget::setCurrentItem(const QString &id)
     m_currentItem->widget()->show();
 
     // Add buttons and remember their actions for later removal
-    QList<QToolButton *> buttons = m_currentItem->createToolBarWidgets();
+    const QList<QToolButton *> buttons = m_currentItem->createToolBarWidgets();
     for (QToolButton *b : buttons)
         m_addedToolBarActions.append(m_toolbar->insertWidget(m_splitAction, b));
 }
diff --git a/src/plugins/cppeditor/compilationdb.cpp b/src/plugins/cppeditor/compilationdb.cpp
index cedb7bf1ff9..f546a20c725 100644
--- a/src/plugins/cppeditor/compilationdb.cpp
+++ b/src/plugins/cppeditor/compilationdb.cpp
@@ -126,7 +126,7 @@ static QJsonObject createFileObject(const FilePath &buildDir,
                     args.append("/TP");
             }
         } else {
-            QStringList langOption
+            const QStringList langOption
                 = createLanguageOptionGcc(projectPart.language, kind,
                                           projectPart.languageExtensions
                                               & LanguageExtension::ObjectiveC);
diff --git a/src/plugins/cppeditor/symbolfinder.cpp b/src/plugins/cppeditor/symbolfinder.cpp
index 2b5d01daa5a..c6521252a59 100644
--- a/src/plugins/cppeditor/symbolfinder.cpp
+++ b/src/plugins/cppeditor/symbolfinder.cpp
@@ -445,8 +445,8 @@ QList<Declaration *> SymbolFinder::findMatchingDeclaration(const LookupContext &
 
     // For member functions not defined inline, add fuzzy matches as fallbacks. We cannot do
     // this for free functions, because there is no guarantee that there's a separate declaration.
-    QList<Declaration *> fuzzyMatches = argumentCountMatch + nameMatch;
     if (!functionType->enclosingScope() || !functionType->enclosingScope()->asClass()) {
+        const QList<Declaration *> fuzzyMatches = argumentCountMatch + nameMatch;
         for (Declaration * const d : fuzzyMatches) {
             if (d->enclosingScope() && d->enclosingScope()->asClass())
                 result.append(d);
diff --git a/src/plugins/cppeditor/typehierarchybuilder.cpp b/src/plugins/cppeditor/typehierarchybuilder.cpp
index a18945f065b..79ed5b5c9cd 100644
--- a/src/plugins/cppeditor/typehierarchybuilder.cpp
+++ b/src/plugins/cppeditor/typehierarchybuilder.cpp
@@ -123,7 +123,7 @@ LookupItem TypeHierarchyBuilder::followTypedef(const LookupContext &context, con
                                                Scope *enclosingScope,
                                                std::set<const Symbol *> typedefs)
 {
-    QList<LookupItem> items = context.lookup(symbolName, enclosingScope);
+    const QList<LookupItem> items = context.lookup(symbolName, enclosingScope);
 
     Symbol *actualBaseSymbol = nullptr;
     LookupItem matchingItem;
diff --git a/src/plugins/debugger/dap/dapengine.cpp b/src/plugins/debugger/dap/dapengine.cpp
index a93b7430c84..3a8e3eadf7b 100644
--- a/src/plugins/debugger/dap/dapengine.cpp
+++ b/src/plugins/debugger/dap/dapengine.cpp
@@ -737,8 +737,8 @@ void DapEngine::handleScopesResponse(const QJsonObject &response)
     watchHandler()->resetValueCache();
     watchHandler()->notifyUpdateStarted();
 
-    QJsonArray scopes = response.value("body").toObject().value("scopes").toArray();
-    for (const QJsonValueRef &scope : scopes) {
+    const QJsonArray scopes = response.value("body").toObject().value("scopes").toArray();
+    for (const QJsonValueConstRef &scope : scopes) {
         const QString name = scope.toObject().value("name").toString();
         if (name == "Registers")
             continue;
@@ -752,13 +752,13 @@ void DapEngine::handleScopesResponse(const QJsonObject &response)
 
 void DapEngine::handleThreadsResponse(const QJsonObject &response)
 {
-    QJsonArray threads = response.value("body").toObject().value("threads").toArray();
+    const QJsonArray threads = response.value("body").toObject().value("threads").toArray();
 
     if (threads.isEmpty())
         return;
 
     ThreadsHandler *handler = threadsHandler();
-    for (const QJsonValueRef &thread : threads) {
+    for (const QJsonValueConstRef &thread : threads) {
         ThreadData threadData;
         threadData.id = QString::number(thread.toObject().value("id").toInt());
         threadData.name = thread.toObject().value("name").toString();
@@ -797,10 +797,10 @@ void DapEngine::handleEvaluateResponse(const QJsonObject &response)
 void DapEngine::handleBreakpointResponse(const QJsonObject &response)
 {
     const QJsonObject body = response.value("body").toObject();
-    QJsonArray breakpoints = body.value("breakpoints").toArray();
+    const QJsonArray breakpoints = body.value("breakpoints").toArray();
 
     QHash<QString, QJsonObject> map;
-    for (QJsonValueRef jsonbp : breakpoints) {
+    for (const QJsonValueConstRef &jsonbp : breakpoints) {
         QJsonObject breakpoint = jsonbp.toObject();
         QString fileName = breakpoint.value("source").toObject().value("path").toString();
         int line = breakpoint.value("line").toInt();
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 90efd2b7c93..e5c45f71604 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -1754,7 +1754,7 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev)
               [this] { grabWidget(); });
 
     menu->addSeparator();
-    QModelIndexList mil = ev.currentOrSelectedRows();
+    const QModelIndexList mil = ev.currentOrSelectedRows();
     if (mil.size() > 1) {
         WatchItemSet wis;
         for (const QModelIndex &i : mil)
diff --git a/src/plugins/extensionmanager/extensionsmodel.cpp b/src/plugins/extensionmanager/extensionsmodel.cpp
index e7c52ba2b90..fa0ee4fff94 100644
--- a/src/plugins/extensionmanager/extensionsmodel.cpp
+++ b/src/plugins/extensionmanager/extensionsmodel.cpp
@@ -302,7 +302,7 @@ void ExtensionsModel::setExtensionsJson(const QByteArray &json)
     d->remotePlugins.clear();
 
     qCDebug(modelLog) << "QJsonParseError:" << error.errorString();
-    QJsonArray responseItems = jsonObj.value("items").toArray();
+    const QJsonArray responseItems = jsonObj.value("items").toArray();
 
     for (const QJsonValue &item : responseItems) {
         const QJsonObject itemObject = item.toObject();
diff --git a/src/plugins/languageclient/lspinspector.cpp b/src/plugins/languageclient/lspinspector.cpp
index dcec7d0d599..5b568cc408a 100644
--- a/src/plugins/languageclient/lspinspector.cpp
+++ b/src/plugins/languageclient/lspinspector.cpp
@@ -483,7 +483,7 @@ LspInspectorWidget::LspInspectorWidget(LspInspector *inspector)
             messageEditor->editorWidget()->setVisible(true);
             return;
         }
-        QList<Client *> clients = LanguageClientManager::instance()->clientsByName(
+        const QList<Client *> clients = LanguageClientManager::instance()->clientsByName(
             m_clients->currentText());
         QString errMsg;
         for (Client *client : clients) {
diff --git a/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp b/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
index 7f0876a3b14..759a063438a 100644
--- a/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
+++ b/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
@@ -469,7 +469,7 @@ public:
 
         const LanguageServerProtocol::JsonRpcMessage request(messageValue.toObject());
 
-        auto clients = clientsForDocument(document);
+        const QList<Client *> clients = clientsForDocument(document);
         QTC_CHECK(clients.size() == 1);
 
         for (Client *c : clients) {
diff --git a/src/plugins/lua/luaplugin.cpp b/src/plugins/lua/luaplugin.cpp
index 3bfd51b72cb..2b81d58163f 100644
--- a/src/plugins/lua/luaplugin.cpp
+++ b/src/plugins/lua/luaplugin.cpp
@@ -335,7 +335,7 @@ public:
             }
 
             QList<PluginSpec *> plugins;
-            auto dirs = path.dirEntries(QDir::Dirs | QDir::NoDotAndDotDot);
+            const FilePaths dirs = path.dirEntries(QDir::Dirs | QDir::NoDotAndDotDot);
             for (const auto &dir : dirs) {
                 const auto specFilePath = dir / (dir.fileName() + ".lua");
                 if (specFilePath.exists()) {
@@ -415,12 +415,14 @@ public:
     {
         QSet<PluginSpec *> plugins;
         for (const FilePath &path : pluginPaths) {
-            FilePaths folders = path.dirEntries(FileFilter({}, QDir::Dirs | QDir::NoDotAndDotDot));
+            const FilePaths folders =
+                path.dirEntries(FileFilter({}, QDir::Dirs | QDir::NoDotAndDotDot));
 
             for (const FilePath &folder : folders) {
                 FilePath script = folder / (folder.baseName() + ".lua");
                 if (!script.exists()) {
-                    FilePaths contents = folder.dirEntries(QDir::Dirs | QDir::NoDotAndDotDot);
+                    const FilePaths contents =
+                        folder.dirEntries(QDir::Dirs | QDir::NoDotAndDotDot);
                     if (contents.empty())
                         continue;
 
diff --git a/src/plugins/mcusupport/mcutargetfactory.cpp b/src/plugins/mcusupport/mcutargetfactory.cpp
index 120e2ce89ca..924d77de29c 100644
--- a/src/plugins/mcusupport/mcutargetfactory.cpp
+++ b/src/plugins/mcusupport/mcutargetfactory.cpp
@@ -116,7 +116,7 @@ QList<PackageDescription> aggregatePackageEntries(const McuTargetDescription &de
 Packages McuTargetFactory::createPackages(const McuTargetDescription &desc)
 {
     Packages packages;
-    QList<PackageDescription> packageDescriptions = aggregatePackageEntries(desc);
+    const QList<PackageDescription> packageDescriptions = aggregatePackageEntries(desc);
 
     for (const PackageDescription &pkgDesc : packageDescriptions) {
         packages.insert(createPackage(pkgDesc));
diff --git a/src/plugins/mesonprojectmanager/mesonbuildstep.cpp b/src/plugins/mesonprojectmanager/mesonbuildstep.cpp
index 91a01329b32..e590c5ba324 100644
--- a/src/plugins/mesonprojectmanager/mesonbuildstep.cpp
+++ b/src/plugins/mesonprojectmanager/mesonbuildstep.cpp
@@ -159,7 +159,7 @@ void MesonBuildStep::setupOutputFormatter(Utils::OutputFormatter *formatter)
     m_ninjaParser = new NinjaParser;
     m_ninjaParser->setSourceDirectory(project()->projectDirectory());
     formatter->addLineParser(m_ninjaParser);
-    auto additionalParsers = kit()->createOutputParsers();
+    const QList<OutputLineParser *> additionalParsers = kit()->createOutputParsers();
     for (const auto parser : additionalParsers) {
         parser->setRedirectionDetector(m_ninjaParser);
     }
diff --git a/src/plugins/qmljseditor/qmljseditorsettings.cpp b/src/plugins/qmljseditor/qmljseditorsettings.cpp
index 81df5392028..90de5823c1e 100644
--- a/src/plugins/qmljseditor/qmljseditorsettings.cpp
+++ b/src/plugins/qmljseditor/qmljseditorsettings.cpp
@@ -341,7 +341,7 @@ private:
     void populateAnalyzerMessages(const QList<int> &disabled, const QList<int> &disabledForNonQuickUi)
     {
         using namespace QmlJS::StaticAnalysis;
-        auto knownMessages = Utils::sorted(Message::allMessageTypes());
+        const QList<Type> knownMessages = Utils::sorted(Message::allMessageTypes());
         auto root = analyzerMessageModel.rootItem();
         for (auto msgType : knownMessages) {
             const QString msg = Message::prototypeForMessageType(msgType).message;
diff --git a/src/plugins/qmlprofiler/quick3dframemodel.cpp b/src/plugins/qmlprofiler/quick3dframemodel.cpp
index 1e99fde12e5..ead90312d97 100644
--- a/src/plugins/qmlprofiler/quick3dframemodel.cpp
+++ b/src/plugins/qmlprofiler/quick3dframemodel.cpp
@@ -461,7 +461,7 @@ QList<int> Quick3DFrameModel::frameIndices(const QString &view3DFilter) const
 
 QStringList Quick3DFrameModel::frameNames(const QString &view3D) const
 {
-    auto indices = frameIndices(view3D);
+    const QList<int> indices = frameIndices(view3D);
     QStringList ret;
     for (auto index : indices) {
         const Item &item = m_data[index];
diff --git a/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp b/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
index 729b9caacf0..7e8559ea851 100644
--- a/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
+++ b/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
@@ -29,7 +29,7 @@ QString jsonToQmlProject(const QJsonObject &rootObject)
     QJsonObject versionConfig = rootObject["versions"].toObject();
     QJsonObject environmentConfig = rootObject["environment"].toObject();
     QJsonObject deploymentConfig = rootObject["deployment"].toObject();
-    QJsonArray filesConfig = rootObject["fileGroups"].toArray();
+    const QJsonArray filesConfig = rootObject["fileGroups"].toArray();
     QJsonObject otherProperties = rootObject["otherProperties"].toObject();
 
     QJsonObject mcuObject = rootObject["mcu"].toObject();
diff --git a/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp b/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp
index 466f46adb84..6cd267cfbc9 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectgen/qmlprojectgenerator.cpp
@@ -203,7 +203,7 @@ const FilePath QmlProjectFileGenerator::findInDirTree(const FilePath &dir, const
     if (!files.isEmpty())
         return dir;
 
-    FilePaths subdirs = dir.dirEntries(DIRS_ONLY);
+    const FilePaths subdirs = dir.dirEntries(DIRS_ONLY);
     for (const FilePath &subdir : subdirs) {
         const FilePath result = findInDirTree(subdir, suffixes, currentSearchDepth);
         if (!result.isEmpty())
diff --git a/src/plugins/qnx/qnxtoolchain.cpp b/src/plugins/qnx/qnxtoolchain.cpp
index 8196ef6803d..5d7ec2e0c96 100644
--- a/src/plugins/qnx/qnxtoolchain.cpp
+++ b/src/plugins/qnx/qnxtoolchain.cpp
@@ -57,7 +57,7 @@ static Abis detectTargetAbis(const FilePath &sdpPath)
     if (qnxTarget.isEmpty())
         return result;
 
-    QList<QnxTarget> targets = QnxUtils::findTargets(qnxTarget);
+    const QList<QnxTarget> targets = QnxUtils::findTargets(qnxTarget);
     for (const auto &target : targets) {
         if (!result.contains(target.m_abi))
             result.append(target.m_abi);
diff --git a/src/plugins/qtapplicationmanager/appmanagertargetinformation.cpp b/src/plugins/qtapplicationmanager/appmanagertargetinformation.cpp
index 6dc36e1240f..6285f7efff8 100644
--- a/src/plugins/qtapplicationmanager/appmanagertargetinformation.cpp
+++ b/src/plugins/qtapplicationmanager/appmanagertargetinformation.cpp
@@ -34,7 +34,8 @@ QList<TargetInformation> TargetInformation::readFromProject(
     if (!bc->project()->rootProjectNode())
         return result;
 
-    QVariantList packageTargets = bc->project()->extraData(AppManager::Constants::APPMAN_PACKAGE_TARGETS).toList();
+    const QVariantList packageTargets
+        = bc->project()->extraData(AppManager::Constants::APPMAN_PACKAGE_TARGETS).toList();
 //        qDebug() << "APPMAN TARGETS" << packageTargets;
 
     for (const auto &packageTarget : packageTargets) {
diff --git a/src/plugins/scxmleditor/plugin_interface/eventitem.cpp b/src/plugins/scxmleditor/plugin_interface/eventitem.cpp
index af0827257f3..b0fdc701831 100644
--- a/src/plugins/scxmleditor/plugin_interface/eventitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/eventitem.cpp
@@ -66,7 +66,7 @@ void OnEntryExitItem::updateAttributes()
 
 void OnEntryExitItem::finalizeCreation()
 {
-    auto children = tag()->allChildren();
+    const QVector<ScxmlTag*> children = tag()->allChildren();
     auto pos = m_eventNameItem->boundingRect().bottomLeft();
     for (auto child : children) {
         EventItem *item = new EventItem(pos, this);
diff --git a/src/plugins/squish/objectsmaptreeitem.cpp b/src/plugins/squish/objectsmaptreeitem.cpp
index 1fd39366cde..e1cf6f02ebe 100644
--- a/src/plugins/squish/objectsmaptreeitem.cpp
+++ b/src/plugins/squish/objectsmaptreeitem.cpp
@@ -129,7 +129,7 @@ bool ObjectsMapTreeItem::parseProperties(const QByteArray &properties)
     if (properties.isEmpty() || properties.at(0) != '{')
         return false;
 
-    QString p = QString::fromUtf8(properties);
+    const QString p = QString::fromUtf8(properties);
     ParseState state = None;
     QString name;
     QString value;
diff --git a/src/plugins/squish/squishwizardpages.cpp b/src/plugins/squish/squishwizardpages.cpp
index 5c89e6c81a4..18e685e068b 100644
--- a/src/plugins/squish/squishwizardpages.cpp
+++ b/src/plugins/squish/squishwizardpages.cpp
@@ -136,7 +136,7 @@ void SquishToolkitsPage::fetchServerSettings()
         QApplication::restoreOverrideCursor();
         // FIXME current impl limited to Desktop to avoid confusion and bugreports
         const QStringList ignored = { "Android", "iOS", "VNC", "XView" };
-        auto buttons = m_buttonGroup->buttons();
+        const QList<QAbstractButton*> buttons = m_buttonGroup->buttons();
         for (auto button : buttons) {
             const QString text = button->text();
             if (!ignored.contains(text) && s.licensedToolkits.contains(text)) {
diff --git a/src/plugins/terminal/terminalsettings.cpp b/src/plugins/terminal/terminalsettings.cpp
index c8e1a6f2238..e75d91cb1d1 100644
--- a/src/plugins/terminal/terminalsettings.cpp
+++ b/src/plugins/terminal/terminalsettings.cpp
@@ -404,7 +404,7 @@ static expected_str<void> loadXFCE4ColorScheme(const FilePath &path)
             colorKey.second->setVolatileValue(QColor(ini.value(colorKey.first).toString()));
     }
 
-    QStringList colors = ini.value(QLatin1String("Scheme/ColorPalette")).toStringList();
+    const QStringList colors = ini.value(QLatin1String("Scheme/ColorPalette")).toStringList();
     int i = 0;
     for (const QString &color : colors)
         s.colors[i++].setVolatileValue(QColor(color));
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 0f81aa6f141..134b73c0537 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -3420,7 +3420,7 @@ void TextEditorWidget::insertCodeSnippet(int basePosition,
         }
     }
 
-    QList<CursorPart> cursorParts = Utils::transform(positionedParts,
+    const QList<CursorPart> cursorParts = Utils::transform(positionedParts,
                                                      [doc = document()](const PositionedPart &part) {
                                                          return CursorPart(part, doc);
                                                      });
diff --git a/src/plugins/todo/keyworddialog.cpp b/src/plugins/todo/keyworddialog.cpp
index cebeb7b692f..882b41b29b3 100644
--- a/src/plugins/todo/keyworddialog.cpp
+++ b/src/plugins/todo/keyworddialog.cpp
@@ -157,7 +157,7 @@ bool KeywordDialog::isKeywordNameCorrect()
 {
     // Make sure keyword is not empty and contains no spaces or colons
 
-    QString name = keywordName();
+    const QString name = keywordName();
 
     if (name.isEmpty())
         return false;
diff --git a/src/tools/process_stub/main.cpp b/src/tools/process_stub/main.cpp
index 088e42ec5fb..f250159716a 100644
--- a/src/tools/process_stub/main.cpp
+++ b/src/tools/process_stub/main.cpp
@@ -566,7 +566,7 @@ void killInferior()
 void onControlSocketReadyRead()
 {
     //k = kill, i = interrupt, c = continue, s = shutdown
-    QByteArray data = controlSocket.readAll();
+    const QByteArray data = controlSocket.readAll();
     for (auto ch : data) {
         qCDebug(log) << "Received:" << ch;
 
diff --git a/src/tools/qmlpuppet/qmlpuppet/editor3d/generalhelper.cpp b/src/tools/qmlpuppet/qmlpuppet/editor3d/generalhelper.cpp
index e40b5b2f4d6..647d170383b 100644
--- a/src/tools/qmlpuppet/qmlpuppet/editor3d/generalhelper.cpp
+++ b/src/tools/qmlpuppet/qmlpuppet/editor3d/generalhelper.cpp
@@ -624,7 +624,7 @@ QQuick3DPickResult GeneralHelper::pickViewAt(QQuick3DViewport *view, float posX,
     view->setGlobalPickingEnabled(true);
 
     // With Qt 6.2+, select first suitable result from all picked objects
-    auto pickResults = view->pickAll(posX, posY);
+    const QList<QQuick3DPickResult> pickResults = view->pickAll(posX, posY);
     for (auto pickResult : pickResults) {
         if (isPickable(pickResult.objectHit()))
             return pickResult;
diff --git a/tests/auto/qml/codemodel/check/tst_check.cpp b/tests/auto/qml/codemodel/check/tst_check.cpp
index c306410a099..da74e111d21 100644
--- a/tests/auto/qml/codemodel/check/tst_check.cpp
+++ b/tests/auto/qml/codemodel/check/tst_check.cpp
@@ -74,7 +74,7 @@ void tst_Check::initTestCase()
     ModelManagerInterface *modelManager = ModelManagerInterface::instance();
 
     PathsAndLanguages lPaths;
-    QStringList paths(QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath));
+    const QStringList paths(QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath));
     for (auto p: paths)
         lPaths.maybeInsert(Utils::FilePath::fromString(p), Dialect::Qml);
     ModelManagerInterface::importScan(ModelManagerInterface::workingCopy(), lPaths,