Utils, all: Standardize on QtcSettings

Change-Id: Id222016f15b1c3bfe6710fe5d0297666d4565ef1 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
author: hjk <hjk@qt.io> 2023-09-22 16:15:27 +0200
committer: hjk <hjk@qt.io> 2023-09-27 13:25:31 +0000
commit: 342e066886ff4d472d9e07eb1f5702a548ac3e6e (patch)
tree: af6b09b98c68140e50d752f9da37f74d9736e722 /src/plugins
parent: 4629b0f69ec4320b1ac6d8006b2f1957d5024683 (diff)
154 files changed, 841 insertions, 775 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index c6be6b0aab..65dae8e7fb 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -36,6 +36,7 @@
 #include <utils/persistentsettings.h>
 #include <utils/process.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcsettings.h>
 #include <utils/stringutils.h>
 
 #include <QApplication>
@@ -112,7 +113,7 @@ const QLatin1String X86_64ToolsPrefix("x86_64-linux-android");
 
 const QLatin1String Unknown("unknown");
 const QLatin1String keytoolName("keytool");
-const QLatin1String changeTimeStamp("ChangeTimeStamp");
+const Key changeTimeStamp("ChangeTimeStamp");
 
 const char sdkToolsVersionKey[] = "Pkg.Revision";
 const char ndkRevisionKey[] = "Pkg.Revision";
@@ -180,7 +181,7 @@ QLatin1String AndroidConfig::displayName(const Abi &abi)
     }
 }
 
-void AndroidConfig::load(const QSettings &settings)
+void AndroidConfig::load(const QtcSettings &settings)
 {
     // user settings
     QVariant emulatorArgs = settings.value(EmulatorArgsKey, QString("-netdelay none -netspeed full"));
@@ -220,7 +221,7 @@ void AndroidConfig::load(const QSettings &settings)
     parseDependenciesJson();
 }
 
-void AndroidConfig::save(QSettings &settings) const
+void AndroidConfig::save(QtcSettings &settings) const
 {
     QFileInfo fileInfo(sdkSettingsFileName());
     if (fileInfo.exists())
@@ -1442,7 +1443,7 @@ AndroidConfigurations *AndroidConfigurations::instance()
 
 void AndroidConfigurations::save()
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(SettingsGroup);
     m_config.save(*settings);
     settings->endGroup();
@@ -1541,7 +1542,7 @@ FilePath AndroidConfig::getJdkPath()
 
 void AndroidConfigurations::load()
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(SettingsGroup);
     m_config.load(*settings);
     settings->endGroup();
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index e0d74c0522..c92deec331 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -11,18 +11,14 @@
 #include <projectexplorer/toolchain.h>
 #include <qtsupport/qtversionmanager.h>
 
+#include <utils/filepath.h>
+
 #include <QStringList>
 #include <QVector>
 #include <QHash>
 #include <QMap>
 #include <QVersionNumber>
 
-#include <utils/filepath.h>
-
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
-
 namespace ProjectExplorer { class Abi; }
 
 namespace Android {
@@ -58,8 +54,8 @@ public:
 class AndroidConfig
 {
 public:
-    void load(const QSettings &settings);
-    void save(QSettings &settings) const;
+    void load(const Utils::QtcSettings &settings);
+    void save(Utils::QtcSettings &settings) const;
 
     static QStringList apiLevelNamesFor(const SdkPlatformList &platforms);
     static QString apiLevelNameFor(const SdkPlatform *platform);
diff --git a/src/plugins/autotest/testsettings.cpp b/src/plugins/autotest/testsettings.cpp
index c2293a0b4f..1d5230d711 100644
--- a/src/plugins/autotest/testsettings.cpp
+++ b/src/plugins/autotest/testsettings.cpp
@@ -7,7 +7,9 @@
 #include "autotesttr.h"
 #include "testframeworkmanager.h"
 
-#include <QSettings>
+#include <utils/qtcsettings.h>
+
+using namespace Utils;
 
 namespace Autotest::Internal  {
 
@@ -109,18 +111,18 @@ void TestSettings::toSettings() const
 {
     AspectContainer::writeSettings();
 
-    QSettings *s = Utils::BaseAspect::qtcSettings();
+    QtcSettings *s = BaseAspect::qtcSettings();
     s->beginGroup(Constants::SETTINGSGROUP);
 
     // store frameworks and their current active and grouping state
     for (auto it = frameworks.cbegin(); it != frameworks.cend(); ++it) {
         const Utils::Id &id = it.key();
-        s->setValue(id.toString(), it.value());
-        s->setValue(id.toString() + groupSuffix, frameworksGrouping.value(id));
+        s->setValue(id.toKey(), it.value());
+        s->setValue(id.toKey() + groupSuffix, frameworksGrouping.value(id));
     }
     // ..and the testtools as well
     for (auto it = tools.cbegin(); it != tools.cend(); ++it)
-        s->setValue(it.key().toString(), it.value());
+        s->setValue(it.key().toKey(), it.value());
     s->endGroup();
 }
 
@@ -128,7 +130,7 @@ void TestSettings::fromSettings()
 {
     AspectContainer::readSettings();
 
-    QSettings *s = Utils::BaseAspect::qtcSettings();
+    QtcSettings *s = BaseAspect::qtcSettings();
     s->beginGroup(Constants::SETTINGSGROUP);
 
     // try to get settings for registered frameworks
@@ -137,8 +139,8 @@ void TestSettings::fromSettings()
     frameworksGrouping.clear();
     for (const ITestFramework *framework : registered) {
         // get their active state
-        const Utils::Id id = framework->id();
-        const QString key = id.toString();
+        const Id id = framework->id();
+        const Key key = id.toKey();
         frameworks.insert(id, s->value(key, framework->active()).toBool());
         // and whether grouping is enabled
         frameworksGrouping.insert(id, s->value(key + groupSuffix, framework->grouping()).toBool());
@@ -148,7 +150,7 @@ void TestSettings::fromSettings()
     tools.clear();
     for (const ITestTool *testTool : registeredTools) {
         const Utils::Id id = testTool->id();
-        tools.insert(id, s->value(id.toString(), testTool->active()).toBool());
+        tools.insert(id, s->value(id.toKey(), testTool->active()).toBool());
     }
     s->endGroup();
 }
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp
index 18a4206afd..427d6b9738 100644
--- a/src/plugins/bookmarks/bookmarkmanager.cpp
+++ b/src/plugins/bookmarks/bookmarkmanager.cpp
@@ -293,7 +293,7 @@ void BookmarkView::removeAll()
                                       Tr::tr("Remove All Bookmarks"),
                                       Tr::tr("Are you sure you want to remove all bookmarks from "
                                              "all files in the current session?"),
-                                      QString("RemoveAllBookmarks"))
+                                      Key("RemoveAllBookmarks"))
         != QMessageBox::Yes)
         return;
 
diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index 6557be0db6..64be4075ee 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -61,7 +61,7 @@ static void startFlashingWizard()
 
 static bool isFlashActionDisabled()
 {
-    QSettings * const settings = Core::ICore::settings();
+    QtcSettings * const settings = Core::ICore::settings();
     settings->beginGroup(settingsGroupKey());
     bool disabled = settings->value("flashActionDisabled", false).toBool();
     settings->endGroup();
diff --git a/src/plugins/boot2qt/qdbutils.cpp b/src/plugins/boot2qt/qdbutils.cpp
index fcc6e38da2..922f0838f7 100644
--- a/src/plugins/boot2qt/qdbutils.cpp
+++ b/src/plugins/boot2qt/qdbutils.cpp
@@ -34,7 +34,7 @@ FilePath findTool(QdbTool tool)
     QString filePath = Utils::qtcEnvironmentVariable(overridingEnvironmentVariable(tool));
 
     if (filePath.isEmpty()) {
-        QSettings * const settings = Core::ICore::settings();
+        QtcSettings * const settings = Core::ICore::settings();
         settings->beginGroup(settingsGroupKey());
         filePath = settings->value(settingsKey(tool)).toString();
         settings->endGroup();
@@ -72,20 +72,21 @@ void showMessage(const QString &message, bool important)
         Core::MessageManager::writeSilently(fullMessage);
 }
 
-QString settingsGroupKey()
+Key settingsGroupKey()
 {
-    return QLatin1String("Boot2Qt");
+    return "Boot2Qt";
 }
 
-QString settingsKey(QdbTool tool)
+Key settingsKey(QdbTool tool)
 {
     switch (tool) {
     case QdbTool::FlashingWizard:
-        return QLatin1String("flashingWizardFilePath");
+        return "flashingWizardFilePath";
     case QdbTool::Qdb:
-        return QLatin1String("qdbFilePath");
+        return "qdbFilePath";
     }
-    QTC_ASSERT(false, return QString());
+    QTC_CHECK(false);
+    return {};
 }
 
 } // Qdb::Internal
diff --git a/src/plugins/boot2qt/qdbutils.h b/src/plugins/boot2qt/qdbutils.h
index 1a04007218..61b8ab7143 100644
--- a/src/plugins/boot2qt/qdbutils.h
+++ b/src/plugins/boot2qt/qdbutils.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <utils/filepath.h>
+#include <utils/storekey.h>
 
 namespace Qdb::Internal {
 
@@ -15,7 +16,7 @@ enum class QdbTool {
 Utils::FilePath findTool(QdbTool tool);
 QString overridingEnvironmentVariable(QdbTool tool);
 void showMessage(const QString &message, bool important = false);
-QString settingsGroupKey();
-QString settingsKey(QdbTool tool);
+Utils::Key settingsGroupKey();
+Utils::Key settingsKey(QdbTool tool);
 
 } // Qdb::Internal
diff --git a/src/plugins/clangformat/clangformatindenter.cpp b/src/plugins/clangformat/clangformatindenter.cpp
index 821a434f11..0019982720 100644
--- a/src/plugins/clangformat/clangformatindenter.cpp
+++ b/src/plugins/clangformat/clangformatindenter.cpp
@@ -13,6 +13,7 @@
 #include <extensionsystem/pluginspec.h>
 
 #include <utils/genericconstants.h>
+#include <utils/qtcsettings.h>
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectmanager.h>
@@ -23,6 +24,7 @@
 using namespace clang;
 using namespace format;
 using namespace TextEditor;
+using namespace Utils;
 
 namespace ClangFormat {
 
@@ -42,7 +44,7 @@ static bool isBeautifierOnSaveActivated()
     if (!isBeautifierPluginActivated())
         return false;
 
-    QSettings *s = Core::ICore::settings();
+    QtcSettings *s = Core::ICore::settings();
     bool activated = false;
     s->beginGroup(Utils::Constants::BEAUTIFIER_SETTINGS_GROUP);
     s->beginGroup(Utils::Constants::BEAUTIFIER_GENERAL_GROUP);
diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp
index 652b24b90f..2e3a5c3ae5 100644
--- a/src/plugins/clangtools/clangtool.cpp
+++ b/src/plugins/clangtools/clangtool.cpp
@@ -633,7 +633,7 @@ static bool continueDespiteReleaseBuild(const QString &toolName)
     return CheckableMessageBox::question(ICore::dialogParent(),
                                          title,
                                          message,
-                                         QString("ClangToolsCorrectModeWarning"))
+                                         Key("ClangToolsCorrectModeWarning"))
            == QMessageBox::Yes;
 }
 
diff --git a/src/plugins/clangtools/clangtoolssettings.cpp b/src/plugins/clangtools/clangtoolssettings.cpp
index 8d8f176389..6699be10bd 100644
--- a/src/plugins/clangtools/clangtoolssettings.cpp
+++ b/src/plugins/clangtools/clangtoolssettings.cpp
@@ -104,7 +104,7 @@ ClangToolsSettings::ClangToolsSettings()
     readSettings();
 }
 
-static Store convertToMapFromVersionBefore410(QSettings *s)
+static Store convertToMapFromVersionBefore410(QtcSettings *s)
 {
     const char oldParallelJobsKey[] = "simultaneousProcesses";
     const char oldBuildBeforeAnalysisKey[] = "buildBeforeAnalysis";
diff --git a/src/plugins/clangtools/clangtoolsutils.cpp b/src/plugins/clangtools/clangtoolsutils.cpp
index effab6f325..5b4eb702c9 100644
--- a/src/plugins/clangtools/clangtoolsutils.cpp
+++ b/src/plugins/clangtools/clangtoolsutils.cpp
@@ -141,7 +141,7 @@ void showHintAboutBuildBeforeAnalysis()
     Utils::CheckableMessageBox::information(Core::ICore::dialogParent(),
                                             Tr::tr("Info About Build the Project Before Analysis"),
                                             hintAboutBuildBeforeAnalysis(),
-                                            QString("ClangToolsDisablingBuildBeforeAnalysisHint"));
+                                            Key("ClangToolsDisablingBuildBeforeAnalysisHint"));
 }
 
 FilePath fullPath(const FilePath &executable)
diff --git a/src/plugins/clearcase/clearcasesettings.cpp b/src/plugins/clearcase/clearcasesettings.cpp
index 8ad40642b8..eeff96b2a3 100644
--- a/src/plugins/clearcase/clearcasesettings.cpp
+++ b/src/plugins/clearcase/clearcasesettings.cpp
@@ -4,8 +4,9 @@
 #include "clearcasesettings.h"
 
 #include <utils/environment.h>
+#include <utils/qtcsettings.h>
 
-#include <QSettings>
+using namespace Utils;
 
 namespace ClearCase::Internal {
 
@@ -40,59 +41,59 @@ ClearCaseSettings::ClearCaseSettings() :
     timeOutS(defaultTimeOutS)
 { }
 
-void ClearCaseSettings::fromSettings(QSettings *settings)
+void ClearCaseSettings::fromSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String(groupC));
-    ccCommand = settings->value(QLatin1String(commandKeyC), defaultCommand()).toString();
+    settings->beginGroup(groupC);
+    ccCommand = settings->value(commandKeyC, defaultCommand()).toString();
     ccBinaryPath = Utils::Environment::systemEnvironment().searchInPath(ccCommand);
-    timeOutS = settings->value(QLatin1String(timeOutKeyC), defaultTimeOutS).toInt();
-    autoCheckOut = settings->value(QLatin1String(autoCheckOutKeyC), false).toBool();
-    noComment = settings->value(QLatin1String(noCommentKeyC), false).toBool();
-    keepFileUndoCheckout = settings->value(QLatin1String(keepFileUndoCheckoutKeyC), true).toBool();
-    const QString sDiffType = settings->value(QLatin1String(diffTypeKeyC),
+    timeOutS = settings->value(timeOutKeyC, defaultTimeOutS).toInt();
+    autoCheckOut = settings->value(autoCheckOutKeyC, false).toBool();
+    noComment = settings->value(noCommentKeyC, false).toBool();
+    keepFileUndoCheckout = settings->value(keepFileUndoCheckoutKeyC, true).toBool();
+    const QString sDiffType = settings->value(diffTypeKeyC,
                                               QLatin1String("Graphical")).toString();
     switch (sDiffType[0].toUpper().toLatin1()) {
         case 'G': diffType = GraphicalDiff; break;
         case 'E': diffType = ExternalDiff; break;
     }
 
-    diffArgs = settings->value(QLatin1String(diffArgsKeyC), QLatin1String(defaultDiffArgs)).toString();
-    autoAssignActivityName = settings->value(QLatin1String(autoAssignActivityKeyC), true).toBool();
-    historyCount = settings->value(QLatin1String(historyCountKeyC), int(defaultHistoryCount)).toInt();
-    disableIndexer = settings->value(QLatin1String(disableIndexerKeyC), false).toBool();
-    indexOnlyVOBs = settings->value(QLatin1String(indexOnlyVOBsC), QString()).toString();
+    diffArgs = settings->value(diffArgsKeyC, QLatin1String(defaultDiffArgs)).toString();
+    autoAssignActivityName = settings->value(autoAssignActivityKeyC, true).toBool();
+    historyCount = settings->value(historyCountKeyC, int(defaultHistoryCount)).toInt();
+    disableIndexer = settings->value(disableIndexerKeyC, false).toBool();
+    indexOnlyVOBs = settings->value(indexOnlyVOBsC, QString()).toString();
     extDiffAvailable = !Utils::Environment::systemEnvironment().searchInPath(QLatin1String("diff")).isEmpty();
-    settings->beginGroup(QLatin1String(totalFilesKeyC));
-    const QStringList views = settings->childKeys();
-    for (const QString &view : views)
+    settings->beginGroup(totalFilesKeyC);
+    const KeyList views = settings->childKeys();
+    for (const Key &view : views)
         totalFiles[view] = settings->value(view).toInt();
     settings->endGroup();
     settings->endGroup();
 }
 
-void ClearCaseSettings::toSettings(QSettings *settings) const
+void ClearCaseSettings::toSettings(QtcSettings *settings) const
 {
-    using FilesConstIt = QHash<QString, int>::ConstIterator;
-
-    settings->beginGroup(QLatin1String(groupC));
-    settings->setValue(QLatin1String(commandKeyC), ccCommand);
-    settings->setValue(QLatin1String(autoCheckOutKeyC), autoCheckOut);
-    settings->setValue(QLatin1String(noCommentKeyC), noComment);
-    settings->setValue(QLatin1String(keepFileUndoCheckoutKeyC), keepFileUndoCheckout);
-    settings->setValue(QLatin1String(timeOutKeyC), timeOutS);
+    using FilesConstIt = QHash<Key, int>::ConstIterator;
+
+    settings->beginGroup(groupC);
+    settings->setValue(commandKeyC, ccCommand);
+    settings->setValue(autoCheckOutKeyC, autoCheckOut);
+    settings->setValue(noCommentKeyC, noComment);
+    settings->setValue(keepFileUndoCheckoutKeyC, keepFileUndoCheckout);
+    settings->setValue(timeOutKeyC, timeOutS);
     QString sDiffType;
     switch (diffType) {
         case ExternalDiff:  sDiffType = QLatin1String("External");  break;
         default:            sDiffType = QLatin1String("Graphical"); break;
     }
 
-    settings->setValue(QLatin1String(diffArgsKeyC), diffArgs);
-    settings->setValue(QLatin1String(diffTypeKeyC), sDiffType);
-    settings->setValue(QLatin1String(autoAssignActivityKeyC), autoAssignActivityName);
-    settings->setValue(QLatin1String(historyCountKeyC), historyCount);
-    settings->setValue(QLatin1String(disableIndexerKeyC), disableIndexer);
-    settings->setValue(QLatin1String(indexOnlyVOBsC), indexOnlyVOBs);
-    settings->beginGroup(QLatin1String(totalFilesKeyC));
+    settings->setValue(diffArgsKeyC, diffArgs);
+    settings->setValue(diffTypeKeyC, sDiffType);
+    settings->setValue(autoAssignActivityKeyC, autoAssignActivityName);
+    settings->setValue(historyCountKeyC, historyCount);
+    settings->setValue(disableIndexerKeyC, disableIndexer);
+    settings->setValue(indexOnlyVOBsC, indexOnlyVOBs);
+    settings->beginGroup(totalFilesKeyC);
     const FilesConstIt fcend = totalFiles.constEnd();
     for (FilesConstIt it = totalFiles.constBegin(); it != fcend; ++it)
         settings->setValue(it.key(), it.value());
diff --git a/src/plugins/clearcase/clearcasesettings.h b/src/plugins/clearcase/clearcasesettings.h
index e65b2009ea..344c31d6c9 100644
--- a/src/plugins/clearcase/clearcasesettings.h
+++ b/src/plugins/clearcase/clearcasesettings.h
@@ -4,13 +4,11 @@
 #pragma once
 
 #include <utils/filepath.h>
+#include <utils/storekey.h>
 
 #include <QHash>
-#include <QString>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+namespace Utils { class QtcSettings; }
 
 namespace ClearCase::Internal {
 
@@ -25,8 +23,8 @@ class ClearCaseSettings
 public:
     ClearCaseSettings();
 
-    void fromSettings(QSettings *);
-    void toSettings(QSettings *) const;
+    void fromSettings(Utils::QtcSettings *);
+    void toSettings(Utils::QtcSettings *) const;
 
     bool equals(const ClearCaseSettings &s) const;
 
@@ -40,7 +38,7 @@ public:
     DiffType diffType = GraphicalDiff;
     QString diffArgs;
     QString indexOnlyVOBs;
-    QHash<QString, int> totalFiles;
+    QHash<Utils::Key, int> totalFiles;
     bool autoAssignActivityName = true;
     bool autoCheckOut = true;
     bool noComment = false;
diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp
index 8476d1f04a..a61408e75a 100644
--- a/src/plugins/clearcase/clearcasesync.cpp
+++ b/src/plugins/clearcase/clearcasesync.cpp
@@ -118,7 +118,7 @@ void ClearCaseSync::processCleartoolLsLine(const QDir &viewRootDir, const QStrin
         ClearCasePlugin::setStatus(absFile, FileStatus::CheckedIn, true);
 }
 
-void ClearCaseSync::updateTotalFilesCount(const QString &view, ClearCaseSettings settings,
+void ClearCaseSync::updateTotalFilesCount(const Key &view, ClearCaseSettings settings,
                                           const int processed)
 {
     settings = ClearCasePlugin::settings(); // Might have changed while task was running
@@ -138,7 +138,7 @@ void ClearCaseSync::updateStatusForNotManagedFiles(const QStringList &files)
 void ClearCaseSync::syncSnapshotView(QPromise<void> &promise, QStringList &files,
                                      const ClearCaseSettings &settings)
 {
-    const QString view = ClearCasePlugin::viewData().name;
+    const Key view = keyFromString(ClearCasePlugin::viewData().name);
 
     int totalFileCount = files.size();
     const bool hot = (totalFileCount < 10);
diff --git a/src/plugins/clearcase/clearcasesync.h b/src/plugins/clearcase/clearcasesync.h
index 4b69985b0c..a93d1852c0 100644
--- a/src/plugins/clearcase/clearcasesync.h
+++ b/src/plugins/clearcase/clearcasesync.h
@@ -5,6 +5,8 @@
 
 #include "clearcaseplugin.h"
 
+#include <utils/storekey.h>
+
 QT_BEGIN_NAMESPACE
 class QDir;
 template <typename T>
@@ -24,7 +26,7 @@ public:
     void invalidateStatus(const QDir &viewRootDir, const QStringList &files);
     void invalidateStatusAllFiles();
     void processCleartoolLsLine(const QDir &viewRootDir, const QString &buffer);
-    void updateTotalFilesCount(const QString &view, ClearCaseSettings settings,
+    void updateTotalFilesCount(const Utils::Key &view, ClearCaseSettings settings,
                                const int processed);
     void updateStatusForNotManagedFiles(const QStringList &files);
 
diff --git a/src/plugins/compilerexplorer/compilerexplorereditor.cpp b/src/plugins/compilerexplorer/compilerexplorereditor.cpp
index 2a184152d2..f082985363 100644
--- a/src/plugins/compilerexplorer/compilerexplorereditor.cpp
+++ b/src/plugins/compilerexplorer/compilerexplorereditor.cpp
@@ -480,7 +480,7 @@ EditorWidget::EditorWidget(const QSharedPointer<JsonSettingsDocument> &document,
     setDocumentMode(true);
     setTabPosition(Qt::AllDockWidgetAreas, QTabWidget::TabPosition::South);
 
-    document->setWindowStateCallback([this] { return windowStateCallback(); });
+    document->setWindowStateCallback([this] { return storeFromMap(windowStateCallback()); });
 
     document->settings()->m_sources.setItemAddedCallback<SourceSettings>(
         [this](const std::shared_ptr<SourceSettings> &source) { addSourceEditor(source); });
@@ -544,15 +544,15 @@ QVariantMap EditorWidget::windowStateCallback()
     auto settings = saveSettings();
     QVariantMap result;
 
-    for (const auto &key : settings.keys()) {
+    for (const Key &key : settings.keys()) {
         // QTBUG-116339
-        if (key != "State") {
-            result.insert(key, settings.value(key));
+        if (stringFromKey(key) != "State") {
+            result.insert(stringFromKey(key), settings.value(key));
         } else {
             QVariantMap m;
             m["type"] = "Base64";
             m["value"] = settings.value(key).toByteArray().toBase64();
-            result.insert(key, m);
+            result.insert(stringFromKey(key), m);
         }
     }
 
@@ -646,12 +646,12 @@ void EditorWidget::recreateEditors()
     m_document->settings()->m_sources.forEachItem<SourceSettings>(
         [this](const auto &sourceSettings) { addSourceEditor(sourceSettings); });
 
-    QVariantMap windowState = m_document->settings()->windowState.value();
+    Store windowState = m_document->settings()->windowState.value();
 
     if (!windowState.isEmpty()) {
-        QHash<QString, QVariant> hashMap;
+        QHash<Key, QVariant> hashMap;
         for (const auto &key : windowState.keys()) {
-            if (key != "State")
+            if (key.view() != "State")
                 hashMap.insert(key, windowState.value(key));
             else {
                 QVariant v = windowState.value(key);
diff --git a/src/plugins/compilerexplorer/compilerexplorereditor.h b/src/plugins/compilerexplorer/compilerexplorereditor.h
index 7b827aa162..c2dcfdaebe 100644
--- a/src/plugins/compilerexplorer/compilerexplorereditor.h
+++ b/src/plugins/compilerexplorer/compilerexplorereditor.h
@@ -95,7 +95,7 @@ public:
 
     CompilerExplorerSettings *settings() { return &m_ceSettings; }
 
-    void setWindowStateCallback(std::function<QVariantMap()> callback)
+    void setWindowStateCallback(std::function<Utils::Store()> callback)
     {
         m_windowStateCallback = callback;
     }
@@ -105,7 +105,7 @@ signals:
 
 private:
     mutable CompilerExplorerSettings m_ceSettings;
-    std::function<QVariantMap()> m_windowStateCallback;
+    std::function<Utils::Store()> m_windowStateCallback;
     QUndoStack *m_undoStack;
 };
 
diff --git a/src/plugins/compilerexplorer/compilerexplorersettings.h b/src/plugins/compilerexplorer/compilerexplorersettings.h
index de0aa75e30..64f67122fe 100644
--- a/src/plugins/compilerexplorer/compilerexplorersettings.h
+++ b/src/plugins/compilerexplorer/compilerexplorersettings.h
@@ -32,7 +32,7 @@ public:
     ~CompilerExplorerSettings();
 
     Utils::StringAspect compilerExplorerUrl{this};
-    Utils::TypedAspect<QVariantMap> windowState{this};
+    Utils::TypedAspect<Utils::Store> windowState{this};
 
     Utils::AspectList m_sources{this};
 
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 57d1f19e15..cdca2ba5fd 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -475,10 +475,10 @@ Command *ActionManagerPrivate::overridableAction(Id id)
 
 void ActionManagerPrivate::readUserSettings(Id id, Command *cmd)
 {
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
     settings->beginGroup(kKeyboardSettingsKeyV2);
-    if (settings->contains(id.toString())) {
-        const QVariant v = settings->value(id.toString());
+    if (settings->contains(id.toKey())) {
+        const QVariant v = settings->value(id.toKey());
         if (QMetaType::Type(v.type()) == QMetaType::QStringList) {
             cmd->setKeySequences(Utils::transform<QList>(v.toStringList(), [](const QString &s) {
                 return QKeySequence::fromString(s);
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index 9dbd1980b9..c143a3e54a 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -403,7 +403,7 @@ void CorePlugin::checkSettings()
             msgBox.exec();
         }, Qt::QueuedConnection);
     };
-    const QSettings * const userSettings = ICore::settings();
+    const QtcSettings * const userSettings = ICore::settings();
     QString errorDetails;
     switch (userSettings->status()) {
     case QSettings::NoError: {
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index 9d610ddd13..3217a3c368 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -490,8 +490,8 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
     connect(m_sortCheckBox, &QAbstractButton::toggled, this, [this](bool checked) {
         m_proxyModel.sort(checked ? 0 : -1);
     });
-    QSettings *settings = ICore::settings();
-    m_sortCheckBox->setChecked(settings->value(QLatin1String(sortKeyC), false).toBool());
+    QtcSettings *settings = ICore::settings();
+    m_sortCheckBox->setChecked(settings->value(sortKeyC, false).toBool());
 
     connect(m_categoryList->selectionModel(), &QItemSelectionModel::currentRowChanged,
             this, &SettingsDialog::currentChanged);
@@ -516,8 +516,8 @@ void SettingsDialog::showPage(const Id pageId)
     // handle the case of "show last page"
     Id initialPageId = pageId;
     if (!initialPageId.isValid()) {
-        QSettings *settings = ICore::settings();
-        initialPageId = Id::fromSetting(settings->value(QLatin1String(pageKeyC)));
+        QtcSettings *settings = ICore::settings();
+        initialPageId = Id::fromSetting(settings->value(pageKeyC));
     }
 
     int initialCategoryIndex = -1;
@@ -752,9 +752,9 @@ void SettingsDialog::apply()
 
 void SettingsDialog::done(int val)
 {
-    QSettings *settings = ICore::settings();
-    settings->setValue(QLatin1String(pageKeyC), m_currentPage.toSetting());
-    settings->setValue(QLatin1String(sortKeyC), m_sortCheckBox->isChecked());
+    QtcSettings *settings = ICore::settings();
+    settings->setValue(pageKeyC, m_currentPage.toSetting());
+    settings->setValue(sortKeyC, m_sortCheckBox->isChecked());
 
     ICore::saveSettings(ICore::SettingsDialogDone); // save all settings
 
diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp
index 859119dc1c..38d1d9b2ec 100644
--- a/src/plugins/coreplugin/documentmanager.cpp
+++ b/src/plugins/coreplugin/documentmanager.cpp
@@ -1399,22 +1399,22 @@ void restoreRecentFiles(const QVariantList &recentFiles, const QStringList &rece
 
 void readSettings()
 {
-    QSettings *s = ICore::settings();
+    QtcSettings *s = ICore::settings();
     d->m_recentFiles.clear();
-    s->beginGroup(QLatin1String(settingsGroupC));
-    const QVariantList recentFiles = s->value(QLatin1String(filesKeyC)).toList();
-    const QStringList recentEditorIds = s->value(QLatin1String(editorsKeyC)).toStringList();
+    s->beginGroup(settingsGroupC);
+    const QVariantList recentFiles = s->value(filesKeyC).toList();
+    const QStringList recentEditorIds = s->value(editorsKeyC).toStringList();
     s->endGroup();
 
     restoreRecentFiles(recentFiles, recentEditorIds);
 
-    s->beginGroup(QLatin1String(directoryGroupC));
+    s->beginGroup(directoryGroupC);
 
     d->m_projectsDirectory = FilePath::fromSettings(
-        s->value(QLatin1String(projectDirectoryKeyC), PathChooser::homePath().toSettings()));
+        s->value(projectDirectoryKeyC, PathChooser::homePath().toSettings()));
 
     d->m_useProjectsDirectory
-        = s->value(QLatin1String(useProjectDirectoryKeyC), kUseProjectsDirectoryDefault).toBool();
+        = s->value(useProjectDirectoryKeyC, kUseProjectsDirectoryDefault).toBool();
 
     s->endGroup();
 }
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 8ce244e425..4b059a10fd 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1210,7 +1210,7 @@ void EditorManagerPrivate::saveSettings()
 
 void EditorManagerPrivate::readSettings()
 {
-    QSettings *qs = ICore::settings();
+    QtcSettings *qs = ICore::settings();
 
     const Qt::CaseSensitivity defaultSensitivity = OsSpecificAspects::fileNameCaseSensitivity(
         HostOsInfo::hostOs());
@@ -1232,7 +1232,7 @@ void EditorManagerPrivate::readSettings()
     updateAutoSave();
 }
 
-Qt::CaseSensitivity EditorManagerPrivate::readFileSystemSensitivity(QSettings *settings)
+Qt::CaseSensitivity EditorManagerPrivate::readFileSystemSensitivity(QtcSettings *settings)
 {
     const Qt::CaseSensitivity defaultSensitivity = OsSpecificAspects::fileNameCaseSensitivity(
         HostOsInfo::hostOs());
@@ -3570,7 +3570,7 @@ void EditorManager::hideEditorStatusBar(const QString &id)
 */
 QTextCodec *EditorManager::defaultTextCodec()
 {
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
     const QByteArray codecName =
             settings->value(Constants::SETTINGS_DEFAULTTEXTENCODING).toByteArray();
     if (QTextCodec *candidate = QTextCodec::codecForName(codecName))
@@ -3591,7 +3591,7 @@ QTextCodec *EditorManager::defaultTextCodec()
 */
 TextFileFormat::LineTerminationMode EditorManager::defaultLineEnding()
 {
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
     const int defaultLineTerminator = settings->value(Constants::SETTINGS_DEFAULT_LINE_TERMINATOR,
             TextFileFormat::LineTerminationMode::NativeLineTerminator).toInt();
 
diff --git a/src/plugins/coreplugin/editormanager/editormanager_p.h b/src/plugins/coreplugin/editormanager/editormanager_p.h
index 7e3863e5cf..25c7007b5b 100644
--- a/src/plugins/coreplugin/editormanager/editormanager_p.h
+++ b/src/plugins/coreplugin/editormanager/editormanager_p.h
@@ -96,7 +96,7 @@ public:
 
     static void saveSettings();
     static void readSettings();
-    static Qt::CaseSensitivity readFileSystemSensitivity(QSettings *settings);
+    static Qt::CaseSensitivity readFileSystemSensitivity(Utils::QtcSettings *settings);
     static void writeFileSystemSensitivity(Utils::QtcSettings *settings,
                                            Qt::CaseSensitivity sensitivity);
 
diff --git a/src/plugins/coreplugin/externaltoolmanager.cpp b/src/plugins/coreplugin/externaltoolmanager.cpp
index 0a42bfc9ab..6f85a2b4c1 100644
--- a/src/plugins/coreplugin/externaltoolmanager.cpp
+++ b/src/plugins/coreplugin/externaltoolmanager.cpp
@@ -233,11 +233,11 @@ void ExternalToolManager::setToolsByCategory(const QMap<QString, QList<ExternalT
 void ExternalToolManager::readSettings(const QMap<QString, ExternalTool *> &tools,
                                        QMap<QString, QList<ExternalTool *> > *categoryMap)
 {
-    QSettings *settings = ICore::settings();
-    settings->beginGroup(QLatin1String("ExternalTools"));
+    QtcSettings *settings = ICore::settings();
+    settings->beginGroup("ExternalTools");
 
     if (categoryMap) {
-        settings->beginGroup(QLatin1String("OverrideCategories"));
+        settings->beginGroup("OverrideCategories");
         const QStringList settingsCategories = settings->childGroups();
         for (const QString &settingsCategory : settingsCategories) {
             QString displayCategory = settingsCategory;
@@ -246,7 +246,7 @@ void ExternalToolManager::readSettings(const QMap<QString, ExternalTool *> &tool
             int count = settings->beginReadArray(settingsCategory);
             for (int i = 0; i < count; ++i) {
                 settings->setArrayIndex(i);
-                const QString &toolId = settings->value(QLatin1String("Tool")).toString();
+                const QString &toolId = settings->value("Tool").toString();
                 if (tools.contains(toolId)) {
                     ExternalTool *tool = tools.value(toolId);
                     // remove from old category
@@ -267,11 +267,11 @@ void ExternalToolManager::readSettings(const QMap<QString, ExternalTool *> &tool
 
 static void writeSettings()
 {
-    QSettings *settings = ICore::settings();
-    settings->beginGroup(QLatin1String("ExternalTools"));
-    settings->remove(QLatin1String(""));
+    QtcSettings *settings = ICore::settings();
+    settings->beginGroup("ExternalTools");
+    settings->remove("");
 
-    settings->beginGroup(QLatin1String("OverrideCategories"));
+    settings->beginGroup("OverrideCategories");
     for (auto it = d->m_categoryMap.cbegin(), end = d->m_categoryMap.cend(); it != end; ++it) {
         QString category = it.key();
         if (category.isEmpty())
@@ -281,7 +281,7 @@ static void writeSettings()
         const QList<ExternalTool *> values = it.value();
         for (const ExternalTool *tool : values) {
             settings->setArrayIndex(i);
-            settings->setValue(QLatin1String("Tool"), tool->id());
+            settings->setValue("Tool", tool->id());
             ++i;
         }
         settings->endArray();
diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp
index 6836b70e07..0aedf610f8 100644
--- a/src/plugins/coreplugin/find/findplugin.cpp
+++ b/src/plugins/coreplugin/find/findplugin.cpp
@@ -76,8 +76,8 @@ public:
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
-    void writeSettings(QSettings *settings) const;
-    void readSettings(QSettings *settings);
+    void writeSettings(QtcSettings *settings) const;
+    void readSettings(QtcSettings *settings);
 
     void updateCompletion(const QString &text, FindFlags f);
 
@@ -102,17 +102,17 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
-static inline QString completionSettingsArrayPrefix() { return QStringLiteral("FindCompletions"); }
-static inline QString completionSettingsTextKey() { return QStringLiteral("Text"); }
-static inline QString completionSettingsFlagsKey() { return QStringLiteral("Flags"); }
+static Utils::Key completionSettingsArrayPrefix() { return "FindCompletions"; }
+static Utils::Key completionSettingsTextKey() { return "Text"; }
+static Utils::Key completionSettingsFlagsKey() { return "Flags"; }
 
-void CompletionModel::writeSettings(QSettings *settings) const
+void CompletionModel::writeSettings(QtcSettings *settings) const
 {
     if (m_entries.isEmpty()) {
         settings->remove(completionSettingsArrayPrefix());
     } else {
         const int size = m_entries.size();
-        settings->beginWriteArray(completionSettingsArrayPrefix(), size);
+        settings->beginWriteArray(completionSettingsArrayPrefix().view(), size);
         for (int i = 0; i < size; ++i) {
             settings->setArrayIndex(i);
             settings->setValue(completionSettingsTextKey(), m_entries.at(i).text);
@@ -122,10 +122,10 @@ void CompletionModel::writeSettings(QSettings *settings) const
     }
 }
 
-void CompletionModel::readSettings(QSettings *settings)
+void CompletionModel::readSettings(QtcSettings *settings)
 {
     beginResetModel();
-    const int size = settings->beginReadArray(completionSettingsArrayPrefix());
+    const int size = settings->beginReadArray(completionSettingsArrayPrefix().view());
     m_entries.clear();
     m_entries.reserve(size);
     for (int i = 0; i < size; ++i) {
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index caece8a073..da8c3a1e01 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -1045,19 +1045,19 @@ void FindToolBar::writeSettings()
 
 void FindToolBar::readSettings()
 {
-    QSettings *settings = ICore::settings();
-    settings->beginGroup(QLatin1String("Find"));
-    settings->beginGroup(QLatin1String("FindToolBar"));
+    QtcSettings *settings = ICore::settings();
+    settings->beginGroup("Find");
+    settings->beginGroup("FindToolBar");
     FindFlags flags;
-    if (settings->value(QLatin1String("Backward"), false).toBool())
+    if (settings->value("Backward", false).toBool())
         flags |= FindBackward;
-    if (settings->value(QLatin1String("CaseSensitively"), false).toBool())
+    if (settings->value("CaseSensitively", false).toBool())
         flags |= FindCaseSensitively;
-    if (settings->value(QLatin1String("WholeWords"), false).toBool())
+    if (settings->value("WholeWords", false).toBool())
         flags |= FindWholeWords;
-    if (settings->value(QLatin1String("RegularExpression"), false).toBool())
+    if (settings->value("RegularExpression", false).toBool())
         flags |= FindRegularExpression;
-    if (settings->value(QLatin1String("PreserveCase"), false).toBool())
+    if (settings->value("PreserveCase", false).toBool())
         flags |= FindPreserveCase;
     settings->endGroup();
     settings->endGroup();
diff --git a/src/plugins/coreplugin/find/findtoolwindow.cpp b/src/plugins/coreplugin/find/findtoolwindow.cpp
index d1e3a9fd23..15ca8542db 100644
--- a/src/plugins/coreplugin/find/findtoolwindow.cpp
+++ b/src/plugins/coreplugin/find/findtoolwindow.cpp
@@ -360,9 +360,9 @@ void FindToolWindow::writeSettings()
 
 void FindToolWindow::readSettings()
 {
-    QSettings *settings = ICore::settings();
-    settings->beginGroup(QLatin1String("Find"));
-    const QString currentFilter = settings->value(QLatin1String("CurrentFilter")).toString();
+    QtcSettings *settings = ICore::settings();
+    settings->beginGroup("Find");
+    const QString currentFilter = settings->value("CurrentFilter").toString();
     for (int i = 0; i < m_filters.size(); ++i) {
         IFindFilter *filter = m_filters.at(i);
         filter->readSettings(settings);
diff --git a/src/plugins/coreplugin/find/ifindfilter.h b/src/plugins/coreplugin/find/ifindfilter.h
index 107439fdfd..2d6325eda0 100644
--- a/src/plugins/coreplugin/find/ifindfilter.h
+++ b/src/plugins/coreplugin/find/ifindfilter.h
@@ -9,11 +9,12 @@
 
 QT_BEGIN_NAMESPACE
 class QWidget;
-class QSettings;
 class QKeySequence;
 class Pixmap;
 QT_END_NAMESPACE
 
+namespace Utils { class QtcSettings; }
+
 namespace Core {
 
 class CORE_EXPORT IFindFilter : public QObject
@@ -41,8 +42,8 @@ public:
     { Q_UNUSED(txt) Q_UNUSED(findFlags) }
 
     virtual QWidget *createConfigWidget() { return nullptr; }
-    virtual void writeSettings(QSettings *settings) { Q_UNUSED(settings) }
-    virtual void readSettings(QSettings *settings) { Q_UNUSED(settings) }
+    virtual void writeSettings(Utils::QtcSettings *settings) { Q_UNUSED(settings) }
+    virtual void readSettings(Utils::QtcSettings *settings) { Q_UNUSED(settings) }
 
     static QPixmap pixmapForFindFlags(Utils::FindFlags flags);
     static QString descriptionForFindFlags(Utils::FindFlags flags);
diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp
index ba12111487..8711ad3b61 100644
--- a/src/plugins/coreplugin/find/searchresultwindow.cpp
+++ b/src/plugins/coreplugin/find/searchresultwindow.cpp
@@ -638,9 +638,9 @@ QList<QWidget *> SearchResultWindowPrivate::toolBarWidgets()
 */
 void SearchResultWindow::readSettings()
 {
-    QSettings *s = ICore::settings();
-    s->beginGroup(QLatin1String(SETTINGSKEYSECTIONNAME));
-    d->m_expandCollapseAction->setChecked(s->value(QLatin1String(SETTINGSKEYEXPANDRESULTS),
+    Utils::QtcSettings *s = ICore::settings();
+    s->beginGroup(SETTINGSKEYSECTIONNAME);
+    d->m_expandCollapseAction->setChecked(s->value(SETTINGSKEYEXPANDRESULTS,
                                                    SearchResultWindowPrivate::m_initiallyExpand).toBool());
     s->endGroup();
 }
diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index 07b539da91..208c2f8732 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -255,8 +255,8 @@ void GeneralSettingsWidget::resetLanguage()
 
 QString GeneralSettingsWidget::language()
 {
-    QSettings *settings = ICore::settings();
-    return settings->value(QLatin1String("General/OverrideLanguage")).toString();
+    QtcSettings *settings = ICore::settings();
+    return settings->value("General/OverrideLanguage").toString();
 }
 
 void GeneralSettingsWidget::setLanguage(const QString &locale)
@@ -285,7 +285,7 @@ void GeneralSettingsWidget::fillCodecBox() const
 
 QByteArray GeneralSettingsWidget::codecForLocale()
 {
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
     QByteArray codec = settings->value(settingsKeyCodecForLocale).toByteArray();
     if (codec.isEmpty())
         codec = QTextCodec::codecForLocale()->name();
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 570dbc5d8d..ba4c16a5d5 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -1894,7 +1894,7 @@ void MainWindowPrivate::registerDefaultActions()
                     Tr::tr(
                         "This will hide the menu bar completely. You can show it again by typing ")
                         + cmd->keySequence().toString(QKeySequence::NativeText),
-                    QString("ToogleMenuBarHint"));
+                    Key("ToogleMenuBarHint"));
             }
             globalMenuBar()->setVisible(visible);
         });
diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp
index 7c6ac13abd..39eea1200f 100644
--- a/src/plugins/coreplugin/locator/filesystemfilter.cpp
+++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp
@@ -63,7 +63,7 @@ static bool askForCreating(const QString &title, const FilePath &filePath)
         = CheckableMessageBox::question(ICore::dialogParent(),
                                         title,
                                         Tr::tr("Create \"%1\"?").arg(filePath.shortNativePath()),
-                                        QString(kAlwaysCreate),
+                                        Key(kAlwaysCreate),
                                         QMessageBox::Yes | QMessageBox::Cancel,
                                         QMessageBox::Cancel,
                                         QMessageBox::Yes,
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index cac44faf6f..66fddd1b5d 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -628,23 +628,23 @@ void OutputPaneManager::buttonTriggered(int idx)
 
 void OutputPaneManager::readSettings()
 {
-    QSettings *settings = ICore::settings();
-    int num = settings->beginReadArray(QLatin1String(outputPaneSettingsKeyC));
+    QtcSettings *settings = ICore::settings();
+    int num = settings->beginReadArray(outputPaneSettingsKeyC);
     for (int i = 0; i < num; ++i) {
         settings->setArrayIndex(i);
-        Id id = Id::fromSetting(settings->value(QLatin1String(outputPaneIdKeyC)));
+        Id id = Id::fromSetting(settings->value(outputPaneIdKeyC));
         const int idx = Utils::indexOf(g_outputPanes, Utils::equal(&OutputPaneData::id, id));
         if (idx < 0) // happens for e.g. disabled plugins (with outputpanes) that were loaded before
             continue;
-        const bool visible = settings->value(QLatin1String(outputPaneVisibleKeyC)).toBool();
+        const bool visible = settings->value(outputPaneVisibleKeyC).toBool();
         g_outputPanes[idx].button->setVisible(visible);
     }
     settings->endArray();
 
     m_outputPaneHeightSetting
-        = settings->value(QLatin1String("OutputPanePlaceHolder/Height"), 0).toInt();
+        = settings->value("OutputPanePlaceHolder/Height", 0).toInt();
     const int currentIdx
-        = settings->value(QLatin1String("OutputPanePlaceHolder/CurrentIndex"), 0).toInt();
+        = settings->value("OutputPanePlaceHolder/CurrentIndex", 0).toInt();
     if (QTC_GUARD(currentIdx >= 0 && currentIdx < g_outputPanes.size()))
         setCurrentIndex(currentIdx);
 }
@@ -809,22 +809,22 @@ void OutputPaneManager::popupMenu()
 
 void OutputPaneManager::saveSettings() const
 {
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
     const int n = g_outputPanes.size();
-    settings->beginWriteArray(QLatin1String(outputPaneSettingsKeyC), n);
+    settings->beginWriteArray(outputPaneSettingsKeyC, n);
     for (int i = 0; i < n; ++i) {
         const OutputPaneData &data = g_outputPanes.at(i);
         settings->setArrayIndex(i);
-        settings->setValue(QLatin1String(outputPaneIdKeyC), data.id.toSetting());
-        settings->setValue(QLatin1String(outputPaneVisibleKeyC), data.button->isPaneVisible());
+        settings->setValue(outputPaneIdKeyC, data.id.toSetting());
+        settings->setValue(outputPaneVisibleKeyC, data.button->isPaneVisible());
     }
     settings->endArray();
     int heightSetting = m_outputPaneHeightSetting;
     // update if possible
     if (OutputPanePlaceHolder *curr = OutputPanePlaceHolder::getCurrent())
         heightSetting = curr->nonMaximizedSize();
-    settings->setValue(QLatin1String("OutputPanePlaceHolder/Height"), heightSetting);
-    settings->setValue(QLatin1String("OutputPanePlaceHolder/CurrentIndex"), currentIndex());
+    settings->setValue("OutputPanePlaceHolder/Height", heightSetting);
+    settings->setValue("OutputPanePlaceHolder/CurrentIndex", currentIndex());
 }
 
 void OutputPaneManager::clearPage()
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index 5504f8fe0c..bbad151c03 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -250,7 +250,7 @@ ProgressManagerPrivate::~ProgressManagerPrivate()
 
 void ProgressManagerPrivate::readSettings()
 {
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
     settings->beginGroup(kSettingsGroup);
     m_progressViewPinned = settings->value(kDetailsPinned, kDetailsPinnedDefault).toBool();
     settings->endGroup();
diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp
index d4f8f7aa25..4363735cea 100644
--- a/src/plugins/coreplugin/rightpane.cpp
+++ b/src/plugins/coreplugin/rightpane.cpp
@@ -157,9 +157,9 @@ void RightPaneWidget::saveSettings(Utils::QtcSettings *settings)
     settings->setValueWithDefault("RightPane/Width", m_width, kWidthDefault);
 }
 
-void RightPaneWidget::readSettings(QSettings *settings)
+void RightPaneWidget::readSettings(QtcSettings *settings)
 {
-    setShown(settings->value(QLatin1String("RightPane/Visible"), kVisibleDefault).toBool());
+    setShown(settings->value("RightPane/Visible", kVisibleDefault).toBool());
     m_width = settings->value("RightPane/Width", kWidthDefault).toInt();
 
     // Apply
diff --git a/src/plugins/coreplugin/rightpane.h b/src/plugins/coreplugin/rightpane.h
index a7371f406a..0dd1166951 100644
--- a/src/plugins/coreplugin/rightpane.h
+++ b/src/plugins/coreplugin/rightpane.h
@@ -48,7 +48,7 @@ public:
     ~RightPaneWidget() override;
 
     void saveSettings(Utils::QtcSettings *settings);
-    void readSettings(QSettings *settings);
+    void readSettings(Utils::QtcSettings *settings);
 
     bool isShown() const;
     void setShown(bool b);
diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp
index e1cf32777b..8e38ec224c 100644
--- a/src/plugins/coreplugin/sidebar.cpp
+++ b/src/plugins/coreplugin/sidebar.cpp
@@ -5,14 +5,17 @@
 #include "sidebarwidget.h"
 
 #include "actionmanager/command.h"
+
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcsettings.h>
 #include <utils/utilsicons.h>
 
-#include <QSettings>
 #include <QPointer>
 #include <QToolButton>
 
+using namespace Utils;
+
 namespace Core {
 
 SideBarItem::SideBarItem(QWidget *widget, const QString &id) :
@@ -228,9 +231,9 @@ void SideBar::updateWidgets()
         i->updateAvailableItems();
 }
 
-void SideBar::saveSettings(QSettings *settings, const QString &name)
+void SideBar::saveSettings(QtcSettings *settings, const QString &name)
 {
-    const QString prefix = name.isEmpty() ? name : (name + QLatin1Char('/'));
+    const Key prefix = keyFromString(name.isEmpty() ? name : (name + QLatin1Char('/')));
 
     QStringList views;
     for (int i = 0; i < d->m_widgets.count(); ++i) {
@@ -241,11 +244,10 @@ void SideBar::saveSettings(QSettings *settings, const QString &name)
     if (views.isEmpty() && !d->m_itemMap.isEmpty())
         views.append(d->m_itemMap.cbegin().key());
 
-    settings->setValue(prefix + QLatin1String("Views"), views);
-    settings->setValue(prefix + QLatin1String("Visible"),
-                       parentWidget() ? isVisibleTo(parentWidget()) : true);
-    settings->setValue(prefix + QLatin1String("VerticalPosition"), saveState());
-    settings->setValue(prefix + QLatin1String("Width"), width());
+    settings->setValue(prefix + "Views", views);
+    settings->setValue(prefix + "Visible", parentWidget() ? isVisibleTo(parentWidget()) : true);
+    settings->setValue(prefix + "VerticalPosition", saveState());
+    settings->setValue(prefix + "Width", width());
 }
 
 void SideBar::closeAllWidgets()
@@ -254,13 +256,13 @@ void SideBar::closeAllWidgets()
         removeSideBarWidget(widget);
 }
 
-void SideBar::readSettings(QSettings *settings, const QString &name)
+void SideBar::readSettings(QtcSettings *settings, const QString &name)
 {
-    const QString prefix = name.isEmpty() ? name : (name + QLatin1Char('/'));
+    const Key prefix = keyFromString(name.isEmpty() ? name : (name + QLatin1Char('/')));
 
     closeAllWidgets();
 
-    const QString viewsKey = prefix + QLatin1String("Views");
+    const Key viewsKey = prefix + "Views";
     if (settings->contains(viewsKey)) {
         const QStringList views = settings->value(viewsKey).toStringList();
         if (!views.isEmpty()) {
@@ -277,15 +279,15 @@ void SideBar::readSettings(QSettings *settings, const QString &name)
             insertSideBarWidget(d->m_widgets.count(), id);
     }
 
-    const QString visibleKey = prefix + QLatin1String("Visible");
+    const Key visibleKey = prefix + "Visible";
     if (settings->contains(visibleKey))
         setVisible(settings->value(visibleKey).toBool());
 
-    const QString positionKey = prefix + QLatin1String("VerticalPosition");
+    const Key positionKey = prefix + "VerticalPosition";
     if (settings->contains(positionKey))
         restoreState(settings->value(positionKey).toByteArray());
 
-    const QString widthKey = prefix + QLatin1String("Width");
+    const Key widthKey = prefix + "Width";
     if (settings->contains(widthKey)) {
         QSize s = size();
         s.setWidth(settings->value(widthKey).toInt());
@@ -318,5 +320,5 @@ QMap<QString, Command*> SideBar::shortcutMap() const
 {
     return d->m_shortcutMap;
 }
-} // namespace Core
 
+} // namespace Core
diff --git a/src/plugins/coreplugin/sidebar.h b/src/plugins/coreplugin/sidebar.h
index adbfde1b1d..733d9c9cc6 100644
--- a/src/plugins/coreplugin/sidebar.h
+++ b/src/plugins/coreplugin/sidebar.h
@@ -10,10 +10,11 @@
 #include <QList>
 
 QT_BEGIN_NAMESPACE
-class QSettings;
 class QToolButton;
 QT_END_NAMESPACE
 
+namespace Utils { class QtcSettings; }
+
 namespace Core {
 
 class Command;
@@ -78,8 +79,8 @@ public:
     bool closeWhenEmpty() const;
     void setCloseWhenEmpty(bool value);
 
-    void saveSettings(QSettings *settings, const QString &name);
-    void readSettings(QSettings *settings, const QString &name);
+    void saveSettings(Utils::QtcSettings *settings, const QString &name);
+    void readSettings(Utils::QtcSettings *settings, const QString &name);
     void closeAllWidgets();
     void activateItem(const QString &id);
 
diff --git a/src/plugins/coreplugin/statusbarmanager.cpp b/src/plugins/coreplugin/statusbarmanager.cpp
index 83d910867b..c590b3f29e 100644
--- a/src/plugins/coreplugin/statusbarmanager.cpp
+++ b/src/plugins/coreplugin/statusbarmanager.cpp
@@ -3,8 +3,8 @@
 
 #include "statusbarmanager.h"
 
+#include "icore.h"
 #include "imode.h"
-#include "mainwindow.h"
 #include "minisplitter.h"
 #include "modemanager.h"
 
@@ -16,6 +16,8 @@
 #include <QSplitter>
 #include <QStatusBar>
 
+using namespace Utils;
+
 namespace Core {
 
 const char kSettingsGroup[] = "StatusBar";
@@ -80,9 +82,9 @@ static void createStatusBarManager()
     ICore::addContextObject(statusContext);
 
     QObject::connect(ICore::instance(), &ICore::saveSettingsRequested, ICore::instance(), [] {
-        QSettings *s = ICore::settings();
-        s->beginGroup(QLatin1String(kSettingsGroup));
-        s->setValue(QLatin1String(kLeftSplitWidthKey), m_splitter->sizes().at(0));
+        QtcSettings *s = ICore::settings();
+        s->beginGroup(kSettingsGroup);
+        s->setValue(kLeftSplitWidthKey, m_splitter->sizes().at(0));
         s->endGroup();
     });
 
@@ -132,9 +134,9 @@ void StatusBarManager::destroyStatusBarWidget(QWidget *widget)
 
 void StatusBarManager::restoreSettings()
 {
-    QSettings *s = ICore::settings();
-    s->beginGroup(QLatin1String(kSettingsGroup));
-    int leftSplitWidth = s->value(QLatin1String(kLeftSplitWidthKey), -1).toInt();
+    QtcSettings *s = ICore::settings();
+    s->beginGroup(kSettingsGroup);
+    int leftSplitWidth = s->value(kLeftSplitWidthKey, -1).toInt();
     s->endGroup();
     if (leftSplitWidth < 0) {
         // size first split after its sizeHint + a bit of buffer
diff --git a/src/plugins/cpaster/pasteview.cpp b/src/plugins/cpaster/pasteview.cpp
index b1f4864b6e..6602efe6ba 100644
--- a/src/plugins/cpaster/pasteview.cpp
+++ b/src/plugins/cpaster/pasteview.cpp
@@ -11,6 +11,7 @@
 
 #include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcsettings.h>
 
 #include <QApplication>
 #include <QComboBox>
@@ -27,6 +28,8 @@
 #include <QStackedWidget>
 #include <QTextEdit>
 
+using namespace Utils;
+
 namespace CodePaster {
 
 const char groupC[] = "CPaster";
@@ -197,11 +200,11 @@ int PasteView::showDialog()
     m_uiDescription->selectAll();
 
     // (Re)store dialog size
-    const QSettings *settings = Core::ICore::settings();
-    const QString rootKey = QLatin1String(groupC) + QLatin1Char('/');
-    const int h = settings->value(rootKey + QLatin1String(heightKeyC), height()).toInt();
+    const QtcSettings *settings = Core::ICore::settings();
+    const Key rootKey = Key(groupC) + '/';
+    const int h = settings->value(rootKey + heightKeyC, height()).toInt();
     const int defaultWidth = m_uiPatchView->columnIndicator() + 50;
-    const int w = settings->value(rootKey + QLatin1String(widthKeyC), defaultWidth).toInt();
+    const int w = settings->value(rootKey + widthKeyC, defaultWidth).toInt();
 
     resize(w, h);
 
@@ -273,10 +276,10 @@ void PasteView::accept()
     const Protocol::ContentType ct = Protocol::contentType(m_mimeType);
     protocol->paste(data, ct, expiryDays(), user(), comment(), description());
     // Store settings and close
-    QSettings *settings = Core::ICore::settings();
-    settings->beginGroup(QLatin1String(groupC));
-    settings->setValue(QLatin1String(heightKeyC), height());
-    settings->setValue(QLatin1String(widthKeyC), width());
+    QtcSettings *settings = Core::ICore::settings();
+    settings->beginGroup(groupC);
+    settings->setValue(heightKeyC, height());
+    settings->setValue(widthKeyC, width());
     settings->endGroup();
     QDialog::accept();
 }
diff --git a/src/plugins/cppeditor/clangdiagnosticconfig.cpp b/src/plugins/cppeditor/clangdiagnosticconfig.cpp
index d97ece6616..bfc7b0436e 100644
--- a/src/plugins/cppeditor/clangdiagnosticconfig.cpp
+++ b/src/plugins/cppeditor/clangdiagnosticconfig.cpp
@@ -5,8 +5,9 @@
 #include "cpptoolsreuse.h"
 
 #include <utils/qtcassert.h>
+#include <utils/qtcsettings.h>
 
-#include <QSettings>
+using namespace Utils;
 
 namespace CppEditor {
 
@@ -215,7 +216,7 @@ static const char diagnosticConfigsTidyModeKey[] = "clangTidyMode";
 static const char diagnosticConfigsClazyModeKey[] = "clazyMode";
 static const char diagnosticConfigsClazyChecksKey[] = "clazyChecks";
 
-void diagnosticConfigsToSettings(QSettings *s, const ClangDiagnosticConfigs &configs)
+void diagnosticConfigsToSettings(QtcSettings *s, const ClangDiagnosticConfigs &configs)
 {
     s->beginWriteArray(diagnosticConfigsArrayKey);
     for (int i = 0, size = configs.size(); i < size; ++i) {
@@ -234,7 +235,7 @@ void diagnosticConfigsToSettings(QSettings *s, const ClangDiagnosticConfigs &con
     s->endArray();
 }
 
-ClangDiagnosticConfigs diagnosticConfigsFromSettings(QSettings *s)
+ClangDiagnosticConfigs diagnosticConfigsFromSettings(QtcSettings *s)
 {
     ClangDiagnosticConfigs configs;
 
diff --git a/src/plugins/cppeditor/clangdiagnosticconfig.h b/src/plugins/cppeditor/clangdiagnosticconfig.h
index 3442c95db5..5c1070de36 100644
--- a/src/plugins/cppeditor/clangdiagnosticconfig.h
+++ b/src/plugins/cppeditor/clangdiagnosticconfig.h
@@ -12,9 +12,7 @@
 #include <QStringList>
 #include <QVector>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+namespace Utils { class QtcSettings; }
 
 namespace CppEditor {
 
@@ -88,8 +86,8 @@ private:
 
 using ClangDiagnosticConfigs = QVector<ClangDiagnosticConfig>;
 
-ClangDiagnosticConfigs CPPEDITOR_EXPORT diagnosticConfigsFromSettings(QSettings *s);
-void CPPEDITOR_EXPORT diagnosticConfigsToSettings(QSettings *s,
+ClangDiagnosticConfigs CPPEDITOR_EXPORT diagnosticConfigsFromSettings(Utils::QtcSettings *s);
+void CPPEDITOR_EXPORT diagnosticConfigsToSettings(Utils::QtcSettings *s,
                                                   const ClangDiagnosticConfigs &configs);
 
 } // namespace CppEditor
diff --git a/src/plugins/cppeditor/cppfilesettingspage.cpp b/src/plugins/cppeditor/cppfilesettingspage.cpp
index 3d3014f86b..fa31440884 100644
--- a/src/plugins/cppeditor/cppfilesettingspage.cpp
+++ b/src/plugins/cppeditor/cppfilesettingspage.cpp
@@ -9,11 +9,13 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/project.h>
+
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/layoutbuilder.h>
 #include <utils/mimeutils.h>
 #include <utils/pathchooser.h>
+#include <utils/qtcsettings.h>
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -22,7 +24,6 @@
 #include <QGuiApplication>
 #include <QLineEdit>
 #include <QLocale>
-#include <QSettings>
 #include <QTextStream>
 #include <QVBoxLayout>
 
@@ -49,7 +50,7 @@ const char *licenseTemplateTemplate = QT_TRANSLATE_NOOP("QtC::CppEditor",
 "**   To protect a percent sign, use '%%'.\n"
 "**************************************************************************/\n");
 
-void CppFileSettings::toSettings(QSettings *s) const
+void CppFileSettings::toSettings(QtcSettings *s) const
 {
     const CppFileSettings def;
     s->beginGroup(Constants::CPPEDITOR_SETTINGSGROUP);
@@ -77,7 +78,7 @@ void CppFileSettings::toSettings(QSettings *s) const
     s->endGroup();
 }
 
-void CppFileSettings::fromSettings(QSettings *s)
+void CppFileSettings::fromSettings(QtcSettings *s)
 {
     const CppFileSettings def;
     s->beginGroup(Constants::CPPEDITOR_SETTINGSGROUP);
diff --git a/src/plugins/cppeditor/cppfilesettingspage.h b/src/plugins/cppeditor/cppfilesettingspage.h
index 3232ba4d4d..d82ca6e8bb 100644
--- a/src/plugins/cppeditor/cppfilesettingspage.h
+++ b/src/plugins/cppeditor/cppfilesettingspage.h
@@ -36,8 +36,8 @@ public:
     bool headerPragmaOnce = false;
     bool lowerCaseFiles = Constants::LOWERCASE_CPPFILES_DEFAULT;
 
-    void toSettings(QSettings *) const;
-    void fromSettings(QSettings *);
+    void toSettings(Utils::QtcSettings *) const;
+    void fromSettings(Utils::QtcSettings *);
     void addMimeInitializer() const;
     bool applySuffixesToMimeDB();
 
diff --git a/src/plugins/cppeditor/cppquickfixprojectsettings.cpp b/src/plugins/cppeditor/cppquickfixprojectsettings.cpp
index 6c4c6cfbe6..3f3f4bc366 100644
--- a/src/plugins/cppeditor/cppquickfixprojectsettings.cpp
+++ b/src/plugins/cppeditor/cppquickfixprojectsettings.cpp
@@ -148,7 +148,7 @@ bool CppQuickFixProjectsSettings::saveOwnSettings()
     if (m_settingsFile.isEmpty())
         return false;
 
-    QSettings settings(m_settingsFile.toString(), QSettings::IniFormat);
+    QtcSettings settings(m_settingsFile.toString(), QSettings::IniFormat);
     if (settings.status() == QSettings::NoError) {
         m_ownSettings.saveSettingsTo(&settings);
         settings.sync();
@@ -160,7 +160,7 @@ bool CppQuickFixProjectsSettings::saveOwnSettings()
 
 void CppQuickFixProjectsSettings::loadOwnSettingsFromFile()
 {
-    QSettings settings(m_settingsFile.toString(), QSettings::IniFormat);
+    QtcSettings settings(m_settingsFile.toString(), QSettings::IniFormat);
     if (settings.status() == QSettings::NoError) {
         m_ownSettings.loadSettingsFrom(&settings);
         return;
diff --git a/src/plugins/cppeditor/cppquickfixsettings.cpp b/src/plugins/cppeditor/cppquickfixsettings.cpp
index 32377cc8fc..f1992aede2 100644
--- a/src/plugins/cppeditor/cppquickfixsettings.cpp
+++ b/src/plugins/cppeditor/cppquickfixsettings.cpp
@@ -7,10 +7,13 @@
 #include "cppeditorconstants.h"
 
 #include <coreplugin/icore.h>
+
 #include <utils/qtcsettings.h>
 
 #include <QRegularExpression>
 
+using namespace Utils;
+
 namespace CppEditor {
 
 CppQuickFixSettings::CppQuickFixSettings(bool loadGlobalSettings)
@@ -35,7 +38,7 @@ void CppQuickFixSettings::loadGlobalSettings()
     }
 }
 
-void CppQuickFixSettings::loadSettingsFrom(QSettings *s)
+void CppQuickFixSettings::loadSettingsFrom(QtcSettings *s)
 {
     CppQuickFixSettings def;
     s->beginGroup(Constants::QUICK_FIX_SETTINGS_ID);
@@ -110,9 +113,8 @@ void CppQuickFixSettings::loadSettingsFrom(QSettings *s)
     s->endGroup();
 }
 
-void CppQuickFixSettings::saveSettingsTo(QSettings *s)
+void CppQuickFixSettings::saveSettingsTo(QtcSettings *s)
 {
-    using Utils::QtcSettings;
     CppQuickFixSettings def;
     s->beginGroup(Constants::QUICK_FIX_SETTINGS_ID);
     QtcSettings::setValueWithDefault(s,
diff --git a/src/plugins/cppeditor/cppquickfixsettings.h b/src/plugins/cppeditor/cppquickfixsettings.h
index c218428924..d033516276 100644
--- a/src/plugins/cppeditor/cppquickfixsettings.h
+++ b/src/plugins/cppeditor/cppquickfixsettings.h
@@ -9,9 +9,7 @@
 #include <optional>
 #include <vector>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+namespace Utils { class QtcSettings; }
 
 namespace CppEditor {
 
@@ -65,8 +63,8 @@ public:
     explicit CppQuickFixSettings(bool loadGlobalSettings = false);
 
     void loadGlobalSettings();
-    void loadSettingsFrom(QSettings *);
-    void saveSettingsTo(QSettings *);
+    void loadSettingsFrom(Utils::QtcSettings *);
+    void saveSettingsTo(Utils::QtcSettings *);
     void saveAsGlobalSettings();
     void setDefaultSettings();
 
diff --git a/src/plugins/cppeditor/symbolsfindfilter.cpp b/src/plugins/cppeditor/symbolsfindfilter.cpp
index 54a0e6a646..bd05107c64 100644
--- a/src/plugins/cppeditor/symbolsfindfilter.cpp
+++ b/src/plugins/cppeditor/symbolsfindfilter.cpp
@@ -166,22 +166,21 @@ QWidget *SymbolsFindFilter::createConfigWidget()
     return new SymbolsFindFilterConfigWidget(this);
 }
 
-void SymbolsFindFilter::writeSettings(QSettings *settings)
+void SymbolsFindFilter::writeSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String(SETTINGS_GROUP));
-    settings->setValue(QLatin1String(SETTINGS_SYMBOLTYPES), int(m_symbolsToSearch));
-    settings->setValue(QLatin1String(SETTINGS_SEARCHSCOPE), int(m_scope));
+    settings->beginGroup(SETTINGS_GROUP);
+    settings->setValue(SETTINGS_SYMBOLTYPES, int(m_symbolsToSearch));
+    settings->setValue(SETTINGS_SEARCHSCOPE, int(m_scope));
     settings->endGroup();
 }
 
-void SymbolsFindFilter::readSettings(QSettings *settings)
+void SymbolsFindFilter::readSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String(SETTINGS_GROUP));
+    settings->beginGroup(SETTINGS_GROUP);
     m_symbolsToSearch = static_cast<SearchSymbols::SymbolTypes>(
-                settings->value(QLatin1String(SETTINGS_SYMBOLTYPES),
-                                int(SearchSymbols::AllTypes)).toInt());
+                settings->value(SETTINGS_SYMBOLTYPES, int(SearchSymbols::AllTypes)).toInt());
     m_scope = static_cast<SearchScope>(
-                settings->value(QLatin1String(SETTINGS_SEARCHSCOPE),
+                settings->value(SETTINGS_SEARCHSCOPE,
                                 int(SymbolSearcher::SearchProjectsOnly)).toInt());
     settings->endGroup();
     emit symbolsToSearchChanged();
diff --git a/src/plugins/cppeditor/symbolsfindfilter.h b/src/plugins/cppeditor/symbolsfindfilter.h
index a308bd9307..0cdfee87c1 100644
--- a/src/plugins/cppeditor/symbolsfindfilter.h
+++ b/src/plugins/cppeditor/symbolsfindfilter.h
@@ -37,8 +37,8 @@ public:
     void findAll(const QString &txt, Utils::FindFlags findFlags) override;
 
     QWidget *createConfigWidget() override;
-    void writeSettings(QSettings *settings) override;
-    void readSettings(QSettings *settings) override;
+    void writeSettings(Utils::QtcSettings *settings) override;
+    void readSettings(Utils::QtcSettings *settings) override;
 
     void setSymbolsToSearch(const SearchSymbols::SymbolTypes &types) { m_symbolsToSearch = types; }
     SearchSymbols::SymbolTypes symbolsToSearch() const { return m_symbolsToSearch; }
diff --git a/src/plugins/debugger/analyzer/startremotedialog.cpp b/src/plugins/debugger/analyzer/startremotedialog.cpp
index f5e6fad3fe..3e7ec624cf 100644
--- a/src/plugins/debugger/analyzer/startremotedialog.cpp
+++ b/src/plugins/debugger/analyzer/startremotedialog.cpp
@@ -67,7 +67,7 @@ StartRemoteDialog::StartRemoteDialog(QWidget *parent)
     verticalLayout->addLayout(formLayout);
     verticalLayout->addWidget(d->buttonBox);
 
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup("AnalyzerStartRemoteDialog");
     d->kitChooser->populate();
     d->kitChooser->setCurrentKitId(Id::fromSetting(settings->value("profile")));
@@ -93,7 +93,7 @@ StartRemoteDialog::~StartRemoteDialog()
 
 void StartRemoteDialog::accept()
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup("AnalyzerStartRemoteDialog");
     settings->setValue("profile", d->kitChooser->currentKitId().toString());
     settings->setValue("executable", d->executable->text());
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 1c414367ad..53696f8e91 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -2709,7 +2709,7 @@ void BreakpointManager::executeDeleteAllBreakpointsDialog()
                                         Tr::tr("Remove All Breakpoints"),
                                         Tr::tr("Are you sure you want to remove all breakpoints "
                                                "from all files in the current session?"),
-                                        QString("RemoveAllBreakpoints"));
+                                        Key("RemoveAllBreakpoints"));
     if (pressed != QMessageBox::Yes)
         return;
 
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 54aa3f6ca1..7d126701d8 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -2264,7 +2264,7 @@ void CdbEngine::checkQtSdkPdbFiles(const QString &module)
         CheckableMessageBox::information(Core::ICore::dialogParent(),
                                          Tr::tr("Missing Qt Debug Information"),
                                          message,
-                                         QString("CdbQtSdkPdbHint"));
+                                         Key("CdbQtSdkPdbHint"));
 
         showMessage("Missing Qt Debug Information Files package for " + qtName, LogMisc);
     };
@@ -2292,7 +2292,7 @@ void CdbEngine::parseOutputLine(QString line)
                    "Make sure that your antivirus solution is up to date and if that does not work "
                    "consider adding an exception for \"%1\".")
                 .arg(m_extensionFileName),
-            QString("SecureInfoCdbextCannotBeLoaded"));
+            Key("SecureInfoCdbextCannotBeLoaded"));
         notifyEngineSetupFailed();
     }
     static const QString creatorExtPrefix = "<qtcreatorcdbext>|";
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index a222432887..2b8278b01e 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -86,8 +86,8 @@ class StartApplicationParameters
 public:
     QString displayName() const;
     bool equals(const StartApplicationParameters &rhs) const;
-    void toSettings(QSettings *) const;
-    void fromSettings(const QSettings *settings);
+    void toSettings(QtcSettings *) const;
+    void fromSettings(const QtcSettings *settings);
 
     bool operator==(const StartApplicationParameters &p) const { return equals(p); }
     bool operator!=(const StartApplicationParameters &p) const { return !equals(p); }
@@ -140,7 +140,7 @@ QString StartApplicationParameters::displayName() const
     return name;
 }
 
-void StartApplicationParameters::toSettings(QSettings *settings) const
+void StartApplicationParameters::toSettings(QtcSettings *settings) const
 {
     settings->setValue("LastKitId", kitId.toSetting());
     settings->setValue("LastServerPort", serverPort);
@@ -157,7 +157,7 @@ void StartApplicationParameters::toSettings(QSettings *settings) const
     settings->setValue("LastSysRoot", sysRoot.toSettings());
 }
 
-void StartApplicationParameters::fromSettings(const QSettings *settings)
+void StartApplicationParameters::fromSettings(const QtcSettings *settings)
 {
     kitId = Id::fromSetting(settings->value("LastKitId"));
     serverPort = settings->value("LastServerPort").toUInt();
@@ -344,11 +344,11 @@ void StartApplicationDialog::updateState()
 
 void StartApplicationDialog::run(bool attachRemote)
 {
-    const QString settingsGroup = "DebugMode";
+    const Key settingsGroup = "DebugMode";
     const QString arrayName = "StartApplication";
 
     QList<StartApplicationParameters> history;
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
     settings->beginGroup(settingsGroup);
     if (const int arraySize = settings->beginReadArray(arrayName)) {
         for (int i = 0; i < arraySize; ++i) {
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index a4751628ec..9568c68553 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -607,7 +607,7 @@ void DebuggerEnginePrivate::setupViews()
     connect(&m_locationTimer, &QTimer::timeout,
             this, &DebuggerEnginePrivate::resetLocation);
 
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
 
     m_modulesView = new BaseTreeView;
     m_modulesView->setModel(m_modulesHandler.model());
@@ -2730,7 +2730,7 @@ Context CppDebuggerEngine::languageContext() const
 
 void CppDebuggerEngine::validateRunParameters(DebuggerRunParameters &rp)
 {
-    static const QString warnOnInappropriateDebuggerKey = "DebuggerWarnOnInappropriateDebugger";
+    static const Key warnOnInappropriateDebuggerKey = "DebuggerWarnOnInappropriateDebugger";
 
     const bool warnOnRelease = settings().warnOnReleaseBuilds()
                                && rp.toolChainAbi.osFlavor() != Abi::AndroidLinuxFlavor;
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index fbe3c8079a..8949322d0e 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -399,7 +399,7 @@ void DebuggerMainWindow::enterDebugMode()
     if (theMainWindow->d->needRestoreOnModeEnter)
         theMainWindow->restorePersistentSettings();
 
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
     const QString lastPerspectiveId = settings->value(LAST_PERSPECTIVE_KEY).toString();
     Perspective *perspective = Perspective::findPerspective(lastPerspectiveId);
     // If we don't find a perspective with the stored name, pick any.
@@ -440,7 +440,7 @@ void DebuggerMainWindow::leaveDebugMode()
 void DebuggerMainWindow::restorePersistentSettings()
 {
     qCDebug(perspectivesLog) << "RESTORE ALL PERSPECTIVES";
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
     settings->beginGroup(MAINWINDOW_KEY);
 
     // state2 is current, state is kept for upgradeing from <=4.10
@@ -488,7 +488,7 @@ void DebuggerMainWindow::savePersistentSettings() const
         states.insert(type, QVariant::fromValue(state));
     }
 
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
     settings->beginGroup(MAINWINDOW_KEY);
     settings->setValue(CHANGED_DOCK_KEY, QStringList(Utils::toList(d->m_persistentChangedDocks)));
     settings->setValue(STATE_KEY2, states);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index f2c8c59de2..d48a024f44 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2362,7 +2362,7 @@ bool wantRunTool(ToolMode toolMode, const QString &toolName)
         if (Utils::CheckableMessageBox::question(ICore::dialogParent(),
                                                  title,
                                                  message,
-                                                 QString("AnalyzerCorrectModeWarning"))
+                                                 Key("AnalyzerCorrectModeWarning"))
             != QMessageBox::Yes)
                 return false;
     }
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
index 5242ebfc2d..cb0f606416 100644
--- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
+++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
@@ -491,11 +491,11 @@ const char sourcePathMappingTargetKeyC[] = "Target";
 void SourcePathMapAspect::writeSettings() const
 {
     const SourcePathMap sourcePathMap = value();
-    QSettings *s = qtcSettings();
+    QtcSettings *s = qtcSettings();
     s->beginWriteArray(sourcePathMappingArrayNameC);
     if (!sourcePathMap.isEmpty()) {
-        const QString sourcePathMappingSourceKey(sourcePathMappingSourceKeyC);
-        const QString sourcePathMappingTargetKey(sourcePathMappingTargetKeyC);
+        const Key sourcePathMappingSourceKey(sourcePathMappingSourceKeyC);
+        const Key sourcePathMappingTargetKey(sourcePathMappingTargetKeyC);
         int i = 0;
         for (auto it = sourcePathMap.constBegin(), cend = sourcePathMap.constEnd();
              it != cend;
@@ -510,11 +510,11 @@ void SourcePathMapAspect::writeSettings() const
 
 void SourcePathMapAspect::readSettings()
 {
-    QSettings *s = qtcSettings();
+    QtcSettings *s = qtcSettings();
     SourcePathMap sourcePathMap;
     if (const int count = s->beginReadArray(sourcePathMappingArrayNameC)) {
-        const QString sourcePathMappingSourceKey(sourcePathMappingSourceKeyC);
-        const QString sourcePathMappingTargetKey(sourcePathMappingTargetKeyC);
+        const Key sourcePathMappingSourceKey(sourcePathMappingSourceKeyC);
+        const Key sourcePathMappingTargetKey(sourcePathMappingTargetKeyC);
         for (int i = 0; i < count; ++i) {
              s->setArrayIndex(i);
              const QString key = s->value(sourcePathMappingSourceKey).toString();
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index aebf092e8d..08160e22dd 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -2573,7 +2573,7 @@ void WatchModel::clearWatches()
         ICore::dialogParent(),
         Tr::tr("Remove All Expression Evaluators"),
         Tr::tr("Are you sure you want to remove all expression evaluators?"),
-        QString("RemoveAllWatchers"));
+        Key("RemoveAllWatchers"));
     if (ret != QMessageBox::Yes)
         return;
 
diff --git a/src/plugins/designer/formeditor.cpp b/src/plugins/designer/formeditor.cpp
index 090f01cf6e..776e74f0f9 100644
--- a/src/plugins/designer/formeditor.cpp
+++ b/src/plugins/designer/formeditor.cpp
@@ -28,6 +28,7 @@
 
 #include <utils/infobar.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcsettings.h>
 #include <utils/stringutils.h>
 #include <utils/theme/theme.h>
 
@@ -44,23 +45,21 @@
 #include <QActionGroup>
 #include <QApplication>
 #include <QCursor>
+#include <QDebug>
 #include <QDockWidget>
+#include <QElapsedTimer>
+#include <QKeySequence>
 #include <QMenu>
 #include <QMessageBox>
-#include <QKeySequence>
+#include <QPainter>
+#include <QPluginLoader>
 #include <QPrintDialog>
 #include <QPrinter>
-#include <QPainter>
 #include <QStyle>
+#include <QTime>
 #include <QToolBar>
 #include <QVBoxLayout>
 
-#include <QDebug>
-#include <QSettings>
-#include <QPluginLoader>
-#include <QTime>
-#include <QElapsedTimer>
-
 #include <algorithm>
 
 static const char settingsGroupC[] = "Designer";
@@ -145,7 +144,7 @@ public:
 
     void fullInit();
 
-    void saveSettings(QSettings *s);
+    void saveSettings(QtcSettings *s);
 
     void initDesignerSubWindows();
 
@@ -283,7 +282,7 @@ FormEditorData::FormEditorData()
 FormEditorData::~FormEditorData()
 {
     if (m_initStage == FullyInitialized) {
-        QSettings *s = ICore::settings();
+        QtcSettings *s = ICore::settings();
         s->beginGroup(settingsGroupC);
         m_editorWidget->saveSettings(s);
         s->endGroup();
@@ -400,7 +399,7 @@ void FormEditorData::fullInit()
 
     // Nest toolbar and editor widget
     m_editorWidget = new EditorWidget;
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
     settings->beginGroup(settingsGroupC);
     m_editorWidget->restoreSettings(settings);
     settings->endGroup();
@@ -702,7 +701,7 @@ void FormEditorData::setPreviewMenuEnabled(bool e)
     m_previewInStyleMenu->setEnabled(e);
 }
 
-void FormEditorData::saveSettings(QSettings *s)
+void FormEditorData::saveSettings(QtcSettings *s)
 {
     s->beginGroup(settingsGroupC);
     m_editorWidget->saveSettings(s);
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index ddf91b4e1e..d202fb4338 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -518,7 +518,7 @@ void DiffEditor::toggleSync()
 IDiffView *DiffEditor::loadSettings()
 {
     QTC_ASSERT(currentView(), return nullptr);
-    QSettings *s = ICore::settings();
+    QtcSettings *s = ICore::settings();
 
     // Read current settings:
     s->beginGroup(settingsGroupC);
@@ -537,9 +537,9 @@ IDiffView *DiffEditor::loadSettings()
     return view;
 }
 
-void DiffEditor::saveSetting(const QString &key, const QVariant &value) const
+void DiffEditor::saveSetting(const Key &key, const QVariant &value) const
 {
-    QSettings *s = ICore::settings();
+    QtcSettings *s = ICore::settings();
     s->beginGroup(settingsGroupC);
     s->setValue(key, value);
     s->endGroup();
diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h
index 0bf3d52c6d..3bf270b524 100644
--- a/src/plugins/diffeditor/diffeditor.h
+++ b/src/plugins/diffeditor/diffeditor.h
@@ -59,7 +59,7 @@ private:
     void toggleSync();
 
     IDiffView *loadSettings();
-    void saveSetting(const QString &key, const QVariant &value) const;
+    void saveSetting(const Utils::Key &key, const QVariant &value) const;
     void updateEntryToolTip();
     void showDiffView(IDiffView *view);
     void updateDiffEditorSwitcher();
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index dffae9b45c..496fdd786f 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -636,7 +636,7 @@ void FakeVimExCommandsMappings::apply()
 
     if (newMapping != globalCommandMapping) {
         const ExCommandMap &defaultMap = dd->m_defaultExCommandMap;
-        QSettings *settings = ICore::settings();
+        QtcSettings *settings = ICore::settings();
         settings->beginWriteArray(exCommandMapGroup);
         int count = 0;
         using Iterator = ExCommandMap::const_iterator;
@@ -776,7 +776,7 @@ private:
         UserCommandMap &userMap = dd->m_userCommandMap;
 
         if (current != userMap) {
-            QSettings *settings = ICore::settings();
+            QtcSettings *settings = ICore::settings();
             settings->beginWriteArray(userCommandMapGroup);
             int count = 0;
             using Iterator = UserCommandMap::const_iterator;
@@ -1146,7 +1146,7 @@ void FakeVimPluginPrivate::createRelativeNumberWidget(IEditor *editor)
 
 void FakeVimPluginPrivate::readSettings()
 {
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
 
     m_exCommandMap = m_defaultExCommandMap;
     int size = settings->beginReadArray(exCommandMapGroup);
diff --git a/src/plugins/git/gerrit/gerritparameters.cpp b/src/plugins/git/gerrit/gerritparameters.cpp
index ace85a81c4..781597e5e7 100644
--- a/src/plugins/git/gerrit/gerritparameters.cpp
+++ b/src/plugins/git/gerrit/gerritparameters.cpp
@@ -8,9 +8,9 @@
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
 #include <utils/pathchooser.h>
+#include <utils/qtcsettings.h>
 
 #include <QDir>
-#include <QSettings>
 #include <QStandardPaths>
 
 using namespace Utils;
@@ -86,7 +86,7 @@ bool GerritParameters::equals(const GerritParameters &rhs) const
     return server == rhs.server && ssh == rhs.ssh && curl == rhs.curl && https == rhs.https;
 }
 
-void GerritParameters::toSettings(QSettings *s) const
+void GerritParameters::toSettings(QtcSettings *s) const
 {
     s->beginGroup(settingsGroupC);
     s->setValue(hostKeyC, server.host);
@@ -99,16 +99,16 @@ void GerritParameters::toSettings(QSettings *s) const
     s->endGroup();
 }
 
-void GerritParameters::saveQueries(QSettings *s) const
+void GerritParameters::saveQueries(QtcSettings *s) const
 {
     s->beginGroup(settingsGroupC);
     s->setValue(savedQueriesKeyC, savedQueries.join(','));
     s->endGroup();
 }
 
-void GerritParameters::fromSettings(const QSettings *s)
+void GerritParameters::fromSettings(const QtcSettings *s)
 {
-    const QString rootKey = QLatin1String(settingsGroupC) + '/';
+    const Key rootKey = Key(settingsGroupC) + '/';
     server.host = s->value(rootKey + hostKeyC, GerritServer::defaultHost()).toString();
     server.user.userName = s->value(rootKey + userKeyC, QString()).toString();
     ssh = FilePath::fromSettings(s->value(rootKey + sshKeyC, QString()));
diff --git a/src/plugins/git/gerrit/gerritparameters.h b/src/plugins/git/gerrit/gerritparameters.h
index 38a6577885..81644dcfa3 100644
--- a/src/plugins/git/gerrit/gerritparameters.h
+++ b/src/plugins/git/gerrit/gerritparameters.h
@@ -7,9 +7,7 @@
 
 #include <utils/filepath.h>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+namespace Utils { class QtcSettings; }
 
 namespace Gerrit {
 namespace Internal {
@@ -21,9 +19,9 @@ public:
 
     bool isValid() const;
     bool equals(const GerritParameters &rhs) const;
-    void toSettings(QSettings *) const;
-    void saveQueries(QSettings *) const;
-    void fromSettings(const QSettings *);
+    void toSettings(Utils::QtcSettings *) const;
+    void saveQueries(Utils::QtcSettings *) const;
+    void fromSettings(const Utils::QtcSettings *);
     void setPortFlagBySshType();
 
     friend bool operator==(const GerritParameters &p1, const GerritParameters &p2)
diff --git a/src/plugins/git/gerrit/gerritserver.cpp b/src/plugins/git/gerrit/gerritserver.cpp
index a91c963d6a..2bcb305853 100644
--- a/src/plugins/git/gerrit/gerritserver.cpp
+++ b/src/plugins/git/gerrit/gerritserver.cpp
@@ -170,8 +170,8 @@ bool GerritServer::fillFromRemote(const QString &remote,
 GerritServer::StoredHostValidity GerritServer::loadSettings()
 {
     StoredHostValidity validity = Invalid;
-    QSettings *settings = Core::ICore::settings();
-    settings->beginGroup("Gerrit/" + host);
+    QtcSettings *settings = Core::ICore::settings();
+    settings->beginGroup("Gerrit/" + keyFromString(host));
     if (!settings->value(isGerritKey, true).toBool()) {
         validity = NotGerrit;
     } else if (settings->contains(isAuthenticatedKey)) {
@@ -188,8 +188,8 @@ GerritServer::StoredHostValidity GerritServer::loadSettings()
 
 void GerritServer::saveSettings(StoredHostValidity validity) const
 {
-    QSettings *settings = Core::ICore::settings();
-    settings->beginGroup("Gerrit/" + host);
+    QtcSettings *settings = Core::ICore::settings();
+    settings->beginGroup("Gerrit/" + keyFromString(host));
     switch (validity) {
     case NotGerrit:
         settings->setValue(isGerritKey, false);
@@ -310,8 +310,8 @@ bool GerritServer::resolveRoot()
 
 bool GerritServer::resolveVersion(const GerritParameters &p, bool forceReload)
 {
-    QSettings *settings = Core::ICore::settings();
-    const QString fullVersionKey = "Gerrit/" + host + '/' + versionKey;
+    QtcSettings *settings = Core::ICore::settings();
+    const Key fullVersionKey = "Gerrit/" + keyFromString(host) + '/' + versionKey;
     version = settings->value(fullVersionKey).toString();
     if (!version.isEmpty() && !forceReload)
         return true;
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index ad6c667428..3b561368f0 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -1280,7 +1280,7 @@ QStringList GitClient::setupCheckoutArguments(const FilePath &workingDirectory,
             ICore::dialogParent() /*parent*/,
             Tr::tr("Create Local Branch") /*title*/,
             Tr::tr("Would you like to create a local branch?") /*message*/,
-            QString("Git.CreateLocalBranchOnCheckout"), /* decider */
+            Key("Git.CreateLocalBranchOnCheckout"), /* decider */
             QMessageBox::Yes | QMessageBox::No /*buttons*/,
             QMessageBox::No /*default button*/,
             QMessageBox::No /*button to save*/)
diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp
index c82226fa83..4d05afffda 100644
--- a/src/plugins/git/gitgrep.cpp
+++ b/src/plugins/git/gitgrep.cpp
@@ -246,12 +246,12 @@ GitGrepParameters GitGrep::gitParameters() const
     return {m_treeLineEdit->text(), m_recurseSubmodules && m_recurseSubmodules->isChecked()};
 }
 
-void GitGrep::readSettings(QSettings *settings)
+void GitGrep::readSettings(QtcSettings *settings)
 {
     m_treeLineEdit->setText(settings->value(GitGrepRef).toString());
 }
 
-void GitGrep::writeSettings(QSettings *settings) const
+void GitGrep::writeSettings(QtcSettings *settings) const
 {
     settings->setValue(GitGrepRef, m_treeLineEdit->text());
 }
diff --git a/src/plugins/git/gitgrep.h b/src/plugins/git/gitgrep.h
index 2f74cfa332..bb6967eb67 100644
--- a/src/plugins/git/gitgrep.h
+++ b/src/plugins/git/gitgrep.h
@@ -24,8 +24,8 @@ public:
     QString title() const override;
     QString toolTip() const override;
     QWidget *widget() const override;
-    void readSettings(QSettings *settings) override;
-    void writeSettings(QSettings *settings) const override;
+    void readSettings(Utils::QtcSettings *settings) override;
+    void writeSettings(Utils::QtcSettings *settings) const override;
     TextEditor::SearchExecutor searchExecutor() const override;
     TextEditor::EditorOpener editorOpener() const override;
 
diff --git a/src/plugins/gitlab/gitlabparameters.cpp b/src/plugins/gitlab/gitlabparameters.cpp
index 79a6ce7da6..c501c23b9f 100644
--- a/src/plugins/gitlab/gitlabparameters.cpp
+++ b/src/plugins/gitlab/gitlabparameters.cpp
@@ -5,6 +5,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
+#include <utils/qtcsettings.h>
 
 #include <QFile>
 #include <QJsonArray>
@@ -13,6 +14,8 @@
 #include <QSettings>
 #include <QStandardPaths>
 
+using namespace Utils;
+
 namespace GitLab {
 
 const char settingsGroupC[] = "GitLab";
@@ -153,13 +156,13 @@ static QList<GitLabServer> readTokensFile(const Utils::FilePath &filePath)
     return result;
 }
 
-static Utils::FilePath tokensFilePath(const QSettings *s)
+static FilePath tokensFilePath(const QtcSettings *s)
 {
-    return Utils::FilePath::fromString(s->fileName()).parentDir()
+    return FilePath::fromString(s->fileName()).parentDir()
             .pathAppended("/qtcreator/gitlabtokens.json");
 }
 
-void GitLabParameters::toSettings(QSettings *s) const
+void GitLabParameters::toSettings(QtcSettings *s) const
 {
 
     writeTokensFile(tokensFilePath(s), gitLabServers);
@@ -169,11 +172,11 @@ void GitLabParameters::toSettings(QSettings *s) const
     s->endGroup();
 }
 
-void GitLabParameters::fromSettings(const QSettings *s)
+void GitLabParameters::fromSettings(const QtcSettings *s)
 {
-    const QString rootKey = QLatin1String(settingsGroupC) + '/';
-    curl = Utils::FilePath::fromSettings(s->value(rootKey + curlKeyC));
-    defaultGitLabServer = Utils::Id::fromSetting(s->value(rootKey + defaultUuidKeyC));
+    const Key rootKey = Key(settingsGroupC) + '/';
+    curl = FilePath::fromSettings(s->value(rootKey + curlKeyC));
+    defaultGitLabServer = Id::fromSetting(s->value(rootKey + defaultUuidKeyC));
 
     gitLabServers = readTokensFile(tokensFilePath(s));
 
diff --git a/src/plugins/gitlab/gitlabparameters.h b/src/plugins/gitlab/gitlabparameters.h
index 7a21976dc2..7dcd6d9daf 100644
--- a/src/plugins/gitlab/gitlabparameters.h
+++ b/src/plugins/gitlab/gitlabparameters.h
@@ -7,10 +7,11 @@
 #include <utils/id.h>
 
 QT_BEGIN_NAMESPACE
-class QSettings;
 class QJsonObject;
 QT_END_NAMESPACE
 
+namespace Utils { class QtcSettings; }
+
 namespace GitLab {
 
 class GitLabServer
@@ -49,8 +50,8 @@ public:
     bool equals(const GitLabParameters &other) const;
     bool isValid() const;
 
-    void toSettings(QSettings *s) const;
-    void fromSettings(const QSettings *s);
+    void toSettings(Utils::QtcSettings *s) const;
+    void fromSettings(const Utils::QtcSettings *s);
 
     GitLabServer currentDefaultServer() const;
     GitLabServer serverForId(const Utils::Id &id) const;
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 2879d57dd5..d693c9973e 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -47,6 +47,7 @@
 #include <utils/qtcassert.h>
 #include <utils/styledbar.h>
 #include <utils/stringutils.h>
+#include <utils/qtcsettings.h>
 #include <utils/theme/theme.h>
 #include <utils/tooltip/tooltip.h>
 
@@ -354,7 +355,7 @@ HelpViewer *HelpPluginPrivate::externalHelpViewer()
     m_externalWindow = createHelpWidget(Context(Constants::C_HELP_EXTERNAL),
                                         HelpWidget::ExternalWindow);
     if (m_externalWindowState.isNull()) {
-        QSettings *settings = ICore::settings();
+        QtcSettings *settings = ICore::settings();
         m_externalWindowState = settings->value(kExternalWindowStateKey).toRect();
     }
     if (m_externalWindowState.isNull())
diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp
index d17a3e8394..bfa827b331 100644
--- a/src/plugins/help/localhelpmanager.cpp
+++ b/src/plugins/help/localhelpmanager.cpp
@@ -137,7 +137,7 @@ void LocalHelpManager::setHomePage(const QString &page)
 
 QFont LocalHelpManager::fallbackFont()
 {
-    QSettings *settings = Core::ICore::settings();
+    Utils::QtcSettings *settings = Core::ICore::settings();
     const QString family = settings->value(kFontFamilyKey, defaultFallbackFontFamily()).toString();
     const int size = settings->value(kFontSizeKey, kDefaultFallbackFontSize).toInt();
     QFont font(family, size);
diff --git a/src/plugins/imageviewer/multiexportdialog.cpp b/src/plugins/imageviewer/multiexportdialog.cpp
index 1b526c9b11..1a22598d26 100644
--- a/src/plugins/imageviewer/multiexportdialog.cpp
+++ b/src/plugins/imageviewer/multiexportdialog.cpp
@@ -104,27 +104,27 @@ static FilePath fileNameForSize(QString pattern, const QSize &s)
 
 // Helpers for writing/reading the user-specified size specifications
 // from/to the settings.
-static inline QString settingsGroup() { return QStringLiteral("ExportSvgSizes"); }
+static Key settingsGroup() { return "ExportSvgSizes"; }
 
 static QVector<QSize> readSettings(const QSize &size)
 {
     QVector<QSize> result;
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(settingsGroup());
     const QStringList keys = settings->allKeys();
     const int idx = keys.indexOf(sizeToString(size));
     if (idx >= 0)
-        result = stringToSizes(settings->value(keys.at(idx)).toString());
+        result = stringToSizes(settings->value(keyFromString(keys.at(idx))).toString());
     settings->endGroup();
     return result;
 }
 
 static void writeSettings(const QSize &size, const QString &sizeSpec)
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(settingsGroup());
     const QString spec = sizeToString(size);
-    settings->setValue(spec, QVariant(sizeSpec));
+    settings->setValue(keyFromString(spec), QVariant(sizeSpec));
 
     // Limit the number of sizes to 10. Remove the
     // first element unless it is the newly added spec.
@@ -132,7 +132,7 @@ static void writeSettings(const QSize &size, const QString &sizeSpec)
     while (keys.size() > 10) {
         const int existingIndex = keys.indexOf(spec);
         const int removeIndex = existingIndex == 0 ? 1 : 0;
-        settings->remove(keys.takeAt(removeIndex));
+        settings->remove(keyFromString(keys.takeAt(removeIndex)));
     }
     settings->endGroup();
 }
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index 545cf85bc8..04ab69b8a2 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -365,7 +365,7 @@ QVersionNumber IosConfigurations::xcodeVersion()
 
 void IosConfigurations::save()
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(SettingsGroup);
     settings->setValue(ignoreAllDevicesKey, m_ignoreAllDevices);
     settings->setValue(screenshotDirPathKey, m_screenshotDir.toString());
@@ -382,7 +382,7 @@ IosConfigurations::IosConfigurations(QObject *parent)
 
 void IosConfigurations::load()
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(SettingsGroup);
     m_ignoreAllDevices = settings->value(ignoreAllDevicesKey, false).toBool();
     m_screenshotDir = FilePath::fromString(settings->value(screenshotDirPathKey).toString());
diff --git a/src/plugins/mcusupport/settingshandler.cpp b/src/plugins/mcusupport/settingshandler.cpp
index 26fcbfb0ae..2bae687cfc 100644
--- a/src/plugins/mcusupport/settingshandler.cpp
+++ b/src/plugins/mcusupport/settingshandler.cpp
@@ -68,13 +68,13 @@ void SettingsHandler::setAutomaticKitCreation(bool isEnabled)
 
 void SettingsHandler::setInitialPlatformName(const QString &platform)
 {
-    QSettings *settings = Core::ICore::settings(QSettings::UserScope);
+    QtcSettings *settings = Core::ICore::settings(QSettings::UserScope);
     settings->setValue(Constants::SETTINGS_KEY_INITIAL_PLATFORM_KEY, platform);
 }
 
 QString SettingsHandler::initialPlatformName() const
 {
-    QSettings *settings = Core::ICore::settings(QSettings::UserScope);
+    QtcSettings *settings = Core::ICore::settings(QSettings::UserScope);
     const QString name
         = settings->value(Constants::SETTINGS_KEY_INITIAL_PLATFORM_KEY, "").toString();
     return name;
diff --git a/src/plugins/modeleditor/modeleditor_plugin.cpp b/src/plugins/modeleditor/modeleditor_plugin.cpp
index 4cdbf85a74..aa98ae10f6 100644
--- a/src/plugins/modeleditor/modeleditor_plugin.cpp
+++ b/src/plugins/modeleditor/modeleditor_plugin.cpp
@@ -65,9 +65,9 @@ void ModelEditorPlugin::initialize()
     Core::JsExpander::registerGlobalObject<JsExtension>("Modeling");
 
     connect(&d->settingsController, &SettingsController::saveSettings,
-            &d->uiController, &UiController::saveSettings);
+            &d->uiController, [this](Utils::QtcSettings *s) { d->uiController.saveSettings(s); });
     connect(&d->settingsController, &SettingsController::loadSettings,
-            &d->uiController, &UiController::loadSettings);
+            &d->uiController, [this](Utils::QtcSettings *s) { d->uiController.loadSettings(s); });
 }
 
 void ModelEditorPlugin::extensionsInitialized()
diff --git a/src/plugins/modeleditor/settingscontroller.cpp b/src/plugins/modeleditor/settingscontroller.cpp
index d4f9424af9..5bb9b5ff10 100644
--- a/src/plugins/modeleditor/settingscontroller.cpp
+++ b/src/plugins/modeleditor/settingscontroller.cpp
@@ -5,7 +5,9 @@
 
 #include "modeleditor_constants.h"
 
-#include <QSettings>
+#include <utils/qtcsettings.h>
+
+using namespace Utils;
 
 namespace ModelEditor {
 namespace Internal {
@@ -19,17 +21,17 @@ void SettingsController::reset()
     emit resetSettings();
 }
 
-void SettingsController::save(QSettings *settings)
+void SettingsController::save(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String(Constants::SETTINGS_GROUP));
+    settings->beginGroup(Constants::SETTINGS_GROUP);
     emit saveSettings(settings);
     settings->endGroup();
     settings->sync();
 }
 
-void SettingsController::load(QSettings *settings)
+void SettingsController::load(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String(Constants::SETTINGS_GROUP));
+    settings->beginGroup(Constants::SETTINGS_GROUP);
     emit loadSettings(settings);
     settings->endGroup();
 }
diff --git a/src/plugins/modeleditor/settingscontroller.h b/src/plugins/modeleditor/settingscontroller.h
index 6efc7063b3..d0d4f496b7 100644
--- a/src/plugins/modeleditor/settingscontroller.h
+++ b/src/plugins/modeleditor/settingscontroller.h
@@ -5,15 +5,12 @@
 
 #include <QObject>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+namespace Utils { class QtcSettings; }
 
 namespace ModelEditor {
 namespace Internal {
 
-class SettingsController :
-        public QObject
+class SettingsController : public QObject
 {
     Q_OBJECT
 
@@ -22,13 +19,13 @@ public:
 
 signals:
     void resetSettings();
-    void saveSettings(QSettings *settings);
-    void loadSettings(QSettings *settings);
+    void saveSettings(Utils::QtcSettings *settings);
+    void loadSettings(Utils::QtcSettings *settings);
 
 public:
     void reset();
-    void save(QSettings *settings);
-    void load(QSettings *settings);
+    void save(Utils::QtcSettings *settings);
+    void load(Utils::QtcSettings *settings);
 };
 
 } // namespace Internal
diff --git a/src/plugins/modeleditor/uicontroller.cpp b/src/plugins/modeleditor/uicontroller.cpp
index 8584b09b0f..f354cf3c53 100644
--- a/src/plugins/modeleditor/uicontroller.cpp
+++ b/src/plugins/modeleditor/uicontroller.cpp
@@ -5,7 +5,9 @@
 
 #include "modeleditor_constants.h"
 
-#include <QSettings>
+#include <utils/qtcsettings.h>
+
+using namespace Utils;
 
 namespace ModelEditor {
 namespace Internal {
@@ -59,28 +61,21 @@ void UiController::onRightHorizSplitterChanged(const QByteArray &state)
     emit rightHorizSplitterChanged(state);
 }
 
-void UiController::saveSettings(QSettings *settings)
+void UiController::saveSettings(QtcSettings *settings)
 {
-    if (hasRightSplitterState()) {
-        settings->setValue(
-                    QLatin1String(Constants::SETTINGS_RIGHT_SPLITTER), d->rightSplitterState);
-    }
-    if (hasRightHorizSplitterState()) {
-        settings->setValue(
-                    QLatin1String(Constants::SETTINGS_RIGHT_HORIZ_SPLITTER),
-                    d->rightHorizSplitterState);
-    }
+    if (hasRightSplitterState())
+        settings->setValue(Constants::SETTINGS_RIGHT_SPLITTER, d->rightSplitterState);
+    if (hasRightHorizSplitterState())
+        settings->setValue(Constants::SETTINGS_RIGHT_HORIZ_SPLITTER, d->rightHorizSplitterState);
 }
 
-void UiController::loadSettings(QSettings *settings)
+void UiController::loadSettings(QtcSettings *settings)
 {
-    if (settings->contains(QLatin1String(Constants::SETTINGS_RIGHT_SPLITTER))) {
-        d->rightSplitterState = settings->value(
-                    QLatin1String(Constants::SETTINGS_RIGHT_SPLITTER)).toByteArray();
-    }
-    if (settings->contains(QLatin1String(Constants::SETTINGS_RIGHT_HORIZ_SPLITTER))) {
-        d->rightHorizSplitterState = settings->value(
-                    QLatin1String(Constants::SETTINGS_RIGHT_HORIZ_SPLITTER)).toByteArray();
+    if (settings->contains(Constants::SETTINGS_RIGHT_SPLITTER))
+        d->rightSplitterState = settings->value(Constants::SETTINGS_RIGHT_SPLITTER).toByteArray();
+    if (settings->contains(Constants::SETTINGS_RIGHT_HORIZ_SPLITTER)) {
+        d->rightHorizSplitterState = settings->value(Constants::SETTINGS_RIGHT_HORIZ_SPLITTER)
+                                            .toByteArray();
     }
 }
 
diff --git a/src/plugins/modeleditor/uicontroller.h b/src/plugins/modeleditor/uicontroller.h
index ce68f65322..44155a6eae 100644
--- a/src/plugins/modeleditor/uicontroller.h
+++ b/src/plugins/modeleditor/uicontroller.h
@@ -5,15 +5,12 @@
 
 #include <QObject>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+namespace Utils { class QtcSettings; }
 
 namespace ModelEditor {
 namespace Internal {
 
-class UiController :
-        public QObject
+class UiController : public QObject
 {
     Q_OBJECT
     class UiControllerPrivate;
@@ -34,8 +31,8 @@ public:
 
     void onRightSplitterChanged(const QByteArray &state);
     void onRightHorizSplitterChanged(const QByteArray &state);
-    void saveSettings(QSettings *settings);
-    void loadSettings(QSettings *settings);
+    void saveSettings(Utils::QtcSettings *settings);
+    void loadSettings(Utils::QtcSettings *settings);
 
 private:
     UiControllerPrivate *d;
diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp
index 9c9e9d5ec5..6951622e52 100644
--- a/src/plugins/perfprofiler/perfprofilertool.cpp
+++ b/src/plugins/perfprofiler/perfprofilertool.cpp
@@ -213,12 +213,11 @@ void PerfProfilerTool::createViews()
             m_flameGraphView, &PerfProfilerFlameGraphView::selectByTypeId);
 
     // Clear settings if the statistics or flamegraph view isn't there yet.
-    QSettings *settings = Core::ICore::settings();
-    settings->beginGroup(QLatin1String("AnalyzerViewSettings_") +
-                         QLatin1String(Constants::PerfProfilerPerspectiveId));
-    if (!settings->contains(m_statisticsView->objectName())
-            || !settings->contains(m_flameGraphView->objectName())) {
-        settings->remove(QString());
+    QtcSettings *settings = Core::ICore::settings();
+    settings->beginGroup(Key("AnalyzerViewSettings_") + Constants::PerfProfilerPerspectiveId);
+    if (!settings->contains(keyFromString(m_statisticsView->objectName()))
+            || !settings->contains(keyFromString(m_flameGraphView->objectName()))) {
+        settings->remove(Key());
     }
     settings->endGroup();
 
diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp
index a416319399..1c8f4c9d94 100644
--- a/src/plugins/projectexplorer/allprojectsfind.cpp
+++ b/src/plugins/projectexplorer/allprojectsfind.cpp
@@ -14,6 +14,7 @@
 #include <texteditor/textdocument.h>
 
 #include <utils/algorithm.h>
+#include <utils/qtcsettings.h>
 
 #include <QGridLayout>
 #include <QSettings>
@@ -113,16 +114,16 @@ QWidget *AllProjectsFind::createConfigWidget()
     return m_configWidget;
 }
 
-void AllProjectsFind::writeSettings(QSettings *settings)
+void AllProjectsFind::writeSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String("AllProjectsFind"));
+    settings->beginGroup("AllProjectsFind");
     writeCommonSettings(settings);
     settings->endGroup();
 }
 
-void AllProjectsFind::readSettings(QSettings *settings)
+void AllProjectsFind::readSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String("AllProjectsFind"));
+    settings->beginGroup("AllProjectsFind");
     readCommonSettings(settings, "*", "");
     settings->endGroup();
 }
diff --git a/src/plugins/projectexplorer/allprojectsfind.h b/src/plugins/projectexplorer/allprojectsfind.h
index d3fcd536d5..02dfc2a27a 100644
--- a/src/plugins/projectexplorer/allprojectsfind.h
+++ b/src/plugins/projectexplorer/allprojectsfind.h
@@ -26,8 +26,8 @@ public:
     bool isEnabled() const override;
 
     QWidget *createConfigWidget() override;
-    void writeSettings(QSettings *settings) override;
-    void readSettings(QSettings *settings) override;
+    void writeSettings(Utils::QtcSettings *settings) override;
+    void readSettings(Utils::QtcSettings *settings) override;
 
 protected:
     static Utils::FileContainer filesForProjects(const QStringList &nameFilters,
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index 13f3d2e5d3..9bea0e0d84 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -536,8 +536,8 @@ void AppOutputPane::storeSettings() const
 
 void AppOutputPane::loadSettings()
 {
-    QSettings * const s = Core::ICore::settings();
-    const auto modeFromSettings = [s](const QString key, AppOutputPaneMode defaultValue) {
+    QtcSettings * const s = Core::ICore::settings();
+    const auto modeFromSettings = [s](const Key key, AppOutputPaneMode defaultValue) {
         return static_cast<AppOutputPaneMode>(s->value(key, int(defaultValue)).toInt());
     };
     m_settings.runOutputMode = modeFromSettings(POP_UP_FOR_RUN_OUTPUT_KEY, kRunOutputModeDefault);
diff --git a/src/plugins/projectexplorer/currentprojectfind.cpp b/src/plugins/projectexplorer/currentprojectfind.cpp
index 43d709d766..fe95d31831 100644
--- a/src/plugins/projectexplorer/currentprojectfind.cpp
+++ b/src/plugins/projectexplorer/currentprojectfind.cpp
@@ -9,8 +9,7 @@
 #include "projecttree.h"
 
 #include <utils/qtcassert.h>
-
-#include <QSettings>
+#include <utils/qtcsettings.h>
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
@@ -93,16 +92,16 @@ void CurrentProjectFind::setupSearch(Core::SearchResult *search)
     });
 }
 
-void CurrentProjectFind::writeSettings(QSettings *settings)
+void CurrentProjectFind::writeSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String("CurrentProjectFind"));
+    settings->beginGroup("CurrentProjectFind");
     writeCommonSettings(settings);
     settings->endGroup();
 }
 
-void CurrentProjectFind::readSettings(QSettings *settings)
+void CurrentProjectFind::readSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String("CurrentProjectFind"));
+    settings->beginGroup("CurrentProjectFind");
     readCommonSettings(settings, "*", "");
     settings->endGroup();
 }
diff --git a/src/plugins/projectexplorer/currentprojectfind.h b/src/plugins/projectexplorer/currentprojectfind.h
index c9ed8cdba3..c9081bcd9f 100644
--- a/src/plugins/projectexplorer/currentprojectfind.h
+++ b/src/plugins/projectexplorer/currentprojectfind.h
@@ -23,8 +23,8 @@ public:
 
     bool isEnabled() const override;
 
-    void writeSettings(QSettings *settings) override;
-    void readSettings(QSettings *settings) override;
+    void writeSettings(Utils::QtcSettings *settings) override;
+    void readSettings(Utils::QtcSettings *settings) override;
 
 protected:
     QString label() const override;
diff --git a/src/plugins/projectexplorer/devicesupport/sshsettings.cpp b/src/plugins/projectexplorer/devicesupport/sshsettings.cpp
index adbf458d26..083ad062c9 100644
--- a/src/plugins/projectexplorer/devicesupport/sshsettings.cpp
+++ b/src/plugins/projectexplorer/devicesupport/sshsettings.cpp
@@ -5,6 +5,7 @@
 
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
+#include <utils/qtcsettings.h>
 
 #include <QReadWriteLock>
 #include <QSettings>
@@ -33,23 +34,23 @@ Q_GLOBAL_STATIC(Internal::SshSettings, sshSettings)
 class AccessSettingsGroup
 {
 public:
-    AccessSettingsGroup(QSettings *settings) : m_settings(settings)
+    AccessSettingsGroup(QtcSettings *settings) : m_settings(settings)
     {
         settings->beginGroup("SshSettings");
     }
     ~AccessSettingsGroup() { m_settings->endGroup(); }
 private:
-    QSettings * const m_settings;
+    QtcSettings * const m_settings;
 };
 
-static QString connectionSharingKey() { return QString("UseConnectionSharing"); }
-static QString connectionSharingTimeoutKey() { return QString("ConnectionSharingTimeout"); }
-static QString sshFilePathKey() { return QString("SshFilePath"); }
-static QString sftpFilePathKey() { return QString("SftpFilePath"); }
-static QString askPassFilePathKey() { return QString("AskpassFilePath"); }
-static QString keygenFilePathKey() { return QString("KeygenFilePath"); }
+static Key connectionSharingKey() { return Key("UseConnectionSharing"); }
+static Key connectionSharingTimeoutKey() { return Key("ConnectionSharingTimeout"); }
+static Key sshFilePathKey() { return Key("SshFilePath"); }
+static Key sftpFilePathKey() { return Key("SftpFilePath"); }
+static Key askPassFilePathKey() { return Key("AskpassFilePath"); }
+static Key keygenFilePathKey() { return Key("KeygenFilePath"); }
 
-void SshSettings::loadSettings(QSettings *settings)
+void SshSettings::loadSettings(QtcSettings *settings)
 {
     QWriteLocker locker(&sshSettings->lock);
     AccessSettingsGroup g(settings);
@@ -67,7 +68,7 @@ void SshSettings::loadSettings(QSettings *settings)
                 settings->value(keygenFilePathKey()).toString());
 }
 
-void SshSettings::storeSettings(QSettings *settings)
+void SshSettings::storeSettings(QtcSettings *settings)
 {
     QReadLocker locker(&sshSettings->lock);
     AccessSettingsGroup g(settings);
diff --git a/src/plugins/projectexplorer/devicesupport/sshsettings.h b/src/plugins/projectexplorer/devicesupport/sshsettings.h
index 47d54413de..ce039bd06b 100644
--- a/src/plugins/projectexplorer/devicesupport/sshsettings.h
+++ b/src/plugins/projectexplorer/devicesupport/sshsettings.h
@@ -5,21 +5,19 @@
 
 #include "../projectexplorer_export.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 #include <functional>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+namespace Utils { class QtcSettings; }
 
 namespace ProjectExplorer {
 
 class PROJECTEXPLORER_EXPORT SshSettings
 {
 public:
-    static void loadSettings(QSettings *settings);
-    static void storeSettings(QSettings *settings);
+    static void loadSettings(Utils::QtcSettings *settings);
+    static void storeSettings(Utils::QtcSettings *settings);
 
     static void setConnectionSharingEnabled(bool share);
     static bool connectionSharingEnabled();
diff --git a/src/plugins/projectexplorer/filesinallprojectsfind.cpp b/src/plugins/projectexplorer/filesinallprojectsfind.cpp
index c5e8412572..f3554f18a9 100644
--- a/src/plugins/projectexplorer/filesinallprojectsfind.cpp
+++ b/src/plugins/projectexplorer/filesinallprojectsfind.cpp
@@ -8,9 +8,9 @@
 #include "projectmanager.h"
 
 #include <coreplugin/editormanager/editormanager.h>
-#include <utils/algorithm.h>
 
-#include <QSettings>
+#include <utils/algorithm.h>
+#include <utils/qtcsettings.h>
 
 using namespace TextEditor;
 using namespace Utils;
@@ -30,14 +30,14 @@ QString FilesInAllProjectsFind::displayName() const
 
 const char kSettingsKey[] = "FilesInAllProjectDirectories";
 
-void FilesInAllProjectsFind::writeSettings(QSettings *settings)
+void FilesInAllProjectsFind::writeSettings(QtcSettings *settings)
 {
     settings->beginGroup(kSettingsKey);
     writeCommonSettings(settings);
     settings->endGroup();
 }
 
-void FilesInAllProjectsFind::readSettings(QSettings *settings)
+void FilesInAllProjectsFind::readSettings(QtcSettings *settings)
 {
     settings->beginGroup(kSettingsKey);
     readCommonSettings(
diff --git a/src/plugins/projectexplorer/filesinallprojectsfind.h b/src/plugins/projectexplorer/filesinallprojectsfind.h
index 1e27b06a30..f96d2a6df9 100644
--- a/src/plugins/projectexplorer/filesinallprojectsfind.h
+++ b/src/plugins/projectexplorer/filesinallprojectsfind.h
@@ -16,8 +16,8 @@ public:
     QString id() const override;
     QString displayName() const override;
 
-    void writeSettings(QSettings *settings) override;
-    void readSettings(QSettings *settings) override;
+    void writeSettings(Utils::QtcSettings *settings) override;
+    void readSettings(Utils::QtcSettings *settings) override;
 
 protected:
     TextEditor::FileContainerProvider fileContainerProvider() const override;
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index e9f5d82adb..66ce26e41f 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -862,7 +862,7 @@ void ProjectWindow::savePersistentSettings() const
 {
     if (!centralWidget())
         return;
-    QSettings * const settings = ICore::settings();
+    QtcSettings * const settings = ICore::settings();
     settings->beginGroup(PROJECT_WINDOW_KEY);
     saveSettings(settings);
     settings->endGroup();
@@ -872,7 +872,7 @@ void ProjectWindow::loadPersistentSettings()
 {
     if (!centralWidget())
         return;
-    QSettings * const settings = ICore::settings();
+    QtcSettings * const settings = ICore::settings();
     settings->beginGroup(PROJECT_WINDOW_KEY);
     restoreSettings(settings);
     settings->endGroup();
diff --git a/src/plugins/python/pythonsettings.cpp b/src/plugins/python/pythonsettings.cpp
index 020aad5225..6cc3ab3e18 100644
--- a/src/plugins/python/pythonsettings.cpp
+++ b/src/plugins/python/pythonsettings.cpp
@@ -908,7 +908,7 @@ QList<Interpreter> PythonSettings::detectPythonVenvs(const FilePath &path)
     return result;
 }
 
-void PythonSettings::initFromSettings(QSettings *settings)
+void PythonSettings::initFromSettings(QtcSettings *settings)
 {
     settings->beginGroup(settingsGroupKey);
     const QVariantList interpreters = settings->value(interpreterKey).toList();
@@ -954,7 +954,7 @@ void PythonSettings::initFromSettings(QSettings *settings)
     settings->endGroup();
 }
 
-void PythonSettings::writeToSettings(QSettings *settings)
+void PythonSettings::writeToSettings(QtcSettings *settings)
 {
     settings->beginGroup(settingsGroupKey);
     QVariantList interpretersVar;
diff --git a/src/plugins/python/pythonsettings.h b/src/plugins/python/pythonsettings.h
index 35939c1ecd..373054094e 100644
--- a/src/plugins/python/pythonsettings.h
+++ b/src/plugins/python/pythonsettings.h
@@ -57,8 +57,8 @@ public slots:
     void listDetectedPython(const QString &detectionSource, QString *logMessage);
 
 private:
-    void initFromSettings(QSettings *settings);
-    void writeToSettings(QSettings *settings);
+    void initFromSettings(Utils::QtcSettings *settings);
+    void writeToSettings(Utils::QtcSettings *settings);
 
     QList<Interpreter> m_interpreters;
     QString m_defaultInterpreterId;
diff --git a/src/plugins/qbsprojectmanager/qbssettings.cpp b/src/plugins/qbsprojectmanager/qbssettings.cpp
index 87d5b5b284..087f11d5e3 100644
--- a/src/plugins/qbsprojectmanager/qbssettings.cpp
+++ b/src/plugins/qbsprojectmanager/qbssettings.cpp
@@ -131,7 +131,7 @@ QbsSettings::QbsSettings()
 
 void QbsSettings::loadSettings()
 {
-    QSettings * const s = Core::ICore::settings();
+    QtcSettings * const s = Core::ICore::settings();
     m_settings.qbsExecutableFilePath = FilePath::fromString(s->value(QBS_EXE_KEY).toString());
     m_settings.defaultInstallDirTemplate = s->value(
                 QBS_DEFAULT_INSTALL_DIR_KEY,
@@ -141,7 +141,7 @@ void QbsSettings::loadSettings()
 
 void QbsSettings::storeSettings() const
 {
-    QSettings * const s = Core::ICore::settings();
+    QtcSettings * const s = Core::ICore::settings();
     QtcSettings::setValueWithDefault(s, QBS_EXE_KEY, m_settings.qbsExecutableFilePath.toString(),
                                      defaultQbsExecutableFilePath().toString());
     s->setValue(QBS_DEFAULT_INSTALL_DIR_KEY, m_settings.defaultInstallDirTemplate);
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
index 27f196dc5a..176f4d7bc7 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
@@ -77,6 +77,8 @@
 
 #include <bindingeditor/signallist.h>
 
+using namespace Utils;
+
 namespace QmlDesigner {
 
 namespace {
@@ -1709,8 +1711,8 @@ QString getEffectIcon(const QString &effectPath)
 
 bool useLayerEffect()
 {
-    QSettings *settings = Core::ICore::settings();
-    const QString layerEffectEntry = "QML/Designer/UseLayerEffect";
+    QtcSettings *settings = Core::ICore::settings();
+    const Key layerEffectEntry = "QML/Designer/UseLayerEffect";
 
     return settings->value(layerEffectEntry, true).toBool();
 }
diff --git a/src/plugins/qmldesigner/components/propertyeditor/aligndistribute.cpp b/src/plugins/qmldesigner/components/propertyeditor/aligndistribute.cpp
index f14e423c9f..b74190bb91 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/aligndistribute.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/aligndistribute.cpp
@@ -19,6 +19,8 @@
 
 #include <cmath>
 
+using namespace Utils;
+
 namespace QmlDesigner {
 
 AlignDistribute::AlignDistribute(QObject *parent)
@@ -663,7 +665,7 @@ AlignDistribute::Dimension AlignDistribute::getDimension(Target target) const
 
 bool AlignDistribute::executePixelPerfectDialog() const
 {
-    Utils::CheckableDecider decider(QString("WarnAboutPixelPerfectDistribution"));
+    Utils::CheckableDecider decider(Key("WarnAboutPixelPerfectDistribution"));
 
     QMessageBox::StandardButton pressed = Utils::CheckableMessageBox::question(
         Core::ICore::dialogParent(),
diff --git a/src/plugins/qmldesigner/components/toolbar/toolbar.cpp b/src/plugins/qmldesigner/components/toolbar/toolbar.cpp
index e4f523c55c..c5a6e9745b 100644
--- a/src/plugins/qmldesigner/components/toolbar/toolbar.cpp
+++ b/src/plugins/qmldesigner/components/toolbar/toolbar.cpp
@@ -10,6 +10,7 @@
 #include <qmldesignerconstants.h>
 
 #include <coreplugin/icore.h>
+
 #include <utils/filepath.h>
 #include <utils/qtcassert.h>
 
@@ -18,6 +19,8 @@
 #include <QStatusBar>
 #include <QToolBar>
 
+using namespace Utils;
+
 namespace QmlDesigner {
 
 static Utils::FilePath propertyEditorResourcesPath()
@@ -127,8 +130,8 @@ Utils::UniqueObjectPtr<QWidget> ToolBar::createStatusBar()
 
 bool ToolBar::isVisible()
 {
-    QSettings *settings = Core::ICore::settings();
-    const QString qdsToolbarEntry = "QML/Designer/TopToolBar";
+    QtcSettings *settings = Core::ICore::settings();
+    const Key qdsToolbarEntry = "QML/Designer/TopToolBar";
 
     return settings->value(qdsToolbarEntry, false).toBool();
 }
diff --git a/src/plugins/qmldesignerbase/studio/studiosettingspage.cpp b/src/plugins/qmldesignerbase/studio/studiosettingspage.cpp
index d88c4cf409..05db597c5b 100644
--- a/src/plugins/qmldesignerbase/studio/studiosettingspage.cpp
+++ b/src/plugins/qmldesignerbase/studio/studiosettingspage.cpp
@@ -8,8 +8,11 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/dialogs/restartdialog.h>
 #include <coreplugin/icore.h>
+
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
+
+#include <utils/qtcsettings.h>
 #include <utils/theme/theme.h>
 
 #include <QApplication>
@@ -23,6 +26,8 @@
 #include <QStyleFactory>
 #include <QVBoxLayout>
 
+using namespace Utils;
+
 namespace QmlDesigner {
 
 namespace {
@@ -53,9 +58,9 @@ bool hideToolsMenuSetting()
     return Core::ICore::settings()->value(Core::Constants::SETTINGS_MENU_HIDE_TOOLS, false).toBool();
 }
 
-void setSettingIfDifferent(const QString &key, bool value, bool &dirty)
+void setSettingIfDifferent(const Key &key, bool value, bool &dirty)
 {
-    QSettings *s = Core::ICore::settings();
+    QtcSettings *s = Core::ICore::settings();
     if (s->value(key, false).toBool() != value) {
         dirty = true;
         s->setValue(key, value);
@@ -175,7 +180,7 @@ void StudioSettingsPage::apply()
         restartDialog.exec();
     }
 
-    QSettings *s = Core::ICore::settings();
+    QtcSettings *s = Core::ICore::settings();
     const QString value = m_pathChooserExamples->filePath().toString();
 
     if (s->value(Paths::exampleDownloadPath, false).toString() != value) {
diff --git a/src/plugins/qmldesignerbase/utils/designersettings.cpp b/src/plugins/qmldesignerbase/utils/designersettings.cpp
index 8157712437..87248bbc20 100644
--- a/src/plugins/qmldesignerbase/utils/designersettings.cpp
+++ b/src/plugins/qmldesignerbase/utils/designersettings.cpp
@@ -3,7 +3,9 @@
 
 #include "designersettings.h"
 
-#include <QSettings>
+#include <utils/qtcsettings.h>
+
+using namespace Utils;
 
 namespace QmlDesigner {
 
@@ -12,7 +14,7 @@ namespace DesignerSettingsGroupKey {
     const char QML_DESIGNER_SETTINGS_GROUP[] = "Designer";
 }
 
-DesignerSettings::DesignerSettings(QSettings *settings) :
+DesignerSettings::DesignerSettings(QtcSettings *settings) :
     m_settings(settings)
 {
     fromSettings(settings);
@@ -38,15 +40,15 @@ QVariant DesignerSettings::value(const QByteArray &key, const QVariant &defaultV
     return m_cache.value(key, defaultValue);
 }
 
-void DesignerSettings::restoreValue(QSettings *settings, const QByteArray &key, const QVariant &defaultValue)
+void DesignerSettings::restoreValue(QtcSettings *settings, const QByteArray &key, const QVariant &defaultValue)
 {
-    m_cache.insert(key, settings->value(QString::fromLatin1(key), defaultValue));
+    m_cache.insert(key, settings->value(key, defaultValue));
 }
 
-void DesignerSettings::fromSettings(QSettings *settings)
+void DesignerSettings::fromSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String(DesignerSettingsGroupKey::QML_SETTINGS_GROUP));
-    settings->beginGroup(QLatin1String(DesignerSettingsGroupKey::QML_DESIGNER_SETTINGS_GROUP));
+    settings->beginGroup(DesignerSettingsGroupKey::QML_SETTINGS_GROUP);
+    settings->beginGroup(DesignerSettingsGroupKey::QML_DESIGNER_SETTINGS_GROUP);
 
     restoreValue(settings, DesignerSettingsKey::ITEMSPACING, 6);
     restoreValue(settings, DesignerSettingsKey::CONTAINERPADDING, 8);
@@ -103,17 +105,17 @@ void DesignerSettings::fromSettings(QSettings *settings)
     settings->endGroup();
 }
 
-void DesignerSettings::storeValue(QSettings *settings, const QByteArray &key, const QVariant &value) const
+void DesignerSettings::storeValue(QtcSettings *settings, const QByteArray &key, const QVariant &value) const
 {
     if (key.isEmpty())
         return;
-    settings->setValue(QString::fromLatin1(key), value);
+    settings->setValue(key, value);
 }
 
-void DesignerSettings::toSettings(QSettings *settings) const
+void DesignerSettings::toSettings(QtcSettings *settings) const
 {
-    settings->beginGroup(QLatin1String(DesignerSettingsGroupKey::QML_SETTINGS_GROUP));
-    settings->beginGroup(QLatin1String(DesignerSettingsGroupKey::QML_DESIGNER_SETTINGS_GROUP));
+    settings->beginGroup(DesignerSettingsGroupKey::QML_SETTINGS_GROUP);
+    settings->beginGroup(DesignerSettingsGroupKey::QML_DESIGNER_SETTINGS_GROUP);
 
     QHash<QByteArray, QVariant>::const_iterator i = m_cache.constBegin();
     while (i != m_cache.constEnd()) {
diff --git a/src/plugins/qmldesignerbase/utils/designersettings.h b/src/plugins/qmldesignerbase/utils/designersettings.h
index 850e2a43a0..aaeec55ec3 100644
--- a/src/plugins/qmldesignerbase/utils/designersettings.h
+++ b/src/plugins/qmldesignerbase/utils/designersettings.h
@@ -10,9 +10,7 @@
 #include <QByteArray>
 #include <QMutex>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+namespace Utils { class QtcSettings; }
 
 namespace QmlDesigner {
 
@@ -74,21 +72,21 @@ inline constexpr char CONTENT_LIBRARY_NEW_FLAG_EXPIRATION_DAYS[] = "ContentLibra
 class QMLDESIGNERBASE_EXPORT DesignerSettings
 {
 public:
-    DesignerSettings(QSettings *settings);
+    DesignerSettings(Utils::QtcSettings *settings);
 
     void insert(const QByteArray &key, const QVariant &value);
     void insert(const QHash<QByteArray, QVariant> &settingsHash);
     QVariant value(const QByteArray &key, const QVariant &defaultValue = {}) const;
 
 private:
-    void fromSettings(QSettings *);
-    void toSettings(QSettings *) const;
+    void fromSettings(Utils::QtcSettings *);
+    void toSettings(Utils::QtcSettings *) const;
 
-    void restoreValue(QSettings *settings, const QByteArray &key,
+    void restoreValue(Utils::QtcSettings *settings, const QByteArray &key,
         const QVariant &defaultValue = QVariant());
-    void storeValue(QSettings *settings, const QByteArray &key, const QVariant &value) const;
+    void storeValue(Utils::QtcSettings *settings, const QByteArray &key, const QVariant &value) const;
 
-    QSettings *m_settings;
+    Utils::QtcSettings *m_settings;
     QHash<QByteArray, QVariant> m_cache;
     mutable QMutex m_mutex;
 };
diff --git a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
index f28fa5d8c1..ee243eb5bc 100644
--- a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
+++ b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp
@@ -7,9 +7,11 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
+
 #include <qmljs/qmljscheck.h>
 #include <qmljs/qmljsstaticanalysismessage.h>
 #include <qmljstools/qmljstoolsconstants.h>
+
 #include <utils/algorithm.h>
 #include <utils/layoutbuilder.h>
 #include <utils/macroexpander.h>
@@ -22,7 +24,6 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QMenu>
-#include <QSettings>
 #include <QTextStream>
 #include <QTreeView>
 
@@ -43,8 +44,10 @@ const char DISABLED_MESSAGES[] = "QmlJSEditor.disabledMessages";
 const char DISABLED_MESSAGES_NONQUICKUI[] = "QmlJSEditor.disabledMessagesNonQuickUI";
 const char DEFAULT_CUSTOM_FORMAT_COMMAND[] = "%{CurrentDocument:Project:QT_HOST_BINS}/qmlformat";
 
-using namespace QmlJSEditor;
 using namespace QmlJSEditor::Internal;
+using namespace Utils;
+
+namespace QmlJSEditor {
 
 static QList<int> defaultDisabledMessages()
 {
@@ -90,7 +93,7 @@ static QStringList defaultDisabledNonQuickUiAsString()
     return result;
 }
 
-void QmlJsEditingSettings::fromSettings(QSettings *settings)
+void QmlJsEditingSettings::fromSettings(QtcSettings *settings)
 {
     settings->beginGroup(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML);
     m_enableContextPane = settings->value(QML_CONTEXTPANE_KEY, QVariant(false)).toBool();
@@ -120,7 +123,7 @@ void QmlJsEditingSettings::fromSettings(QSettings *settings)
     settings->endGroup();
 }
 
-void QmlJsEditingSettings::toSettings(QSettings *settings) const
+void QmlJsEditingSettings::toSettings(QtcSettings *settings) const
 {
     settings->beginGroup(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML);
     settings->setValue(QML_CONTEXTPANE_KEY, m_enableContextPane);
@@ -590,3 +593,5 @@ QmlJsEditingSettingsPage::QmlJsEditingSettingsPage()
     setCategory(Constants::SETTINGS_CATEGORY_QML);
     setWidgetCreator([] { return new QmlJsEditingSettingsPageWidget; });
 }
+
+} // QmlJsEditor
diff --git a/src/plugins/qmljseditor/qmljseditingsettingspage.h b/src/plugins/qmljseditor/qmljseditingsettingspage.h
index d7f8f78bd3..5f6d954fbd 100644
--- a/src/plugins/qmljseditor/qmljseditingsettingspage.h
+++ b/src/plugins/qmljseditor/qmljseditingsettingspage.h
@@ -4,14 +4,12 @@
 #pragma once
 
 #include "qmllssettings.h"
+
 #include <coreplugin/dialogs/ioptionspage.h>
+
 #include <QPointer>
 #include <QWidget>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
-
 namespace QmlJSEditor {
 
 class QmlJsEditingSettings
@@ -22,8 +20,8 @@ public:
     static QmlJsEditingSettings get();
     void set();
 
-    void fromSettings(QSettings *);
-    void toSettings(QSettings *) const;
+    void fromSettings(Utils::QtcSettings *);
+    void toSettings(Utils::QtcSettings *) const;
 
     bool equals(const QmlJsEditingSettings &other) const;
 
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index ecb064c851..ea02239a64 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -569,10 +569,10 @@ ProjectExplorer::RunControl *QmlProfilerTool::attachToWaitingApplication()
     Kit *kit = nullptr;
 
     {
-        QSettings *settings = ICore::settings();
+        QtcSettings *settings = ICore::settings();
 
-        kitId = Id::fromSetting(settings->value(QLatin1String("AnalyzerQmlAttachDialog/kitId")));
-        port = settings->value(QLatin1String("AnalyzerQmlAttachDialog/port"), 3768).toInt();
+        kitId = Id::fromSetting(settings->value("AnalyzerQmlAttachDialog/kitId"));
+        port = settings->value("AnalyzerQmlAttachDialog/port", 3768).toInt();
 
         QmlProfilerAttachDialog dialog;
 
@@ -587,8 +587,8 @@ ProjectExplorer::RunControl *QmlProfilerTool::attachToWaitingApplication()
         QTC_ASSERT(port >= 0, return nullptr);
         QTC_ASSERT(port <= std::numeric_limits<quint16>::max(), return nullptr);
 
-        settings->setValue(QLatin1String("AnalyzerQmlAttachDialog/kitId"), kit->id().toSetting());
-        settings->setValue(QLatin1String("AnalyzerQmlAttachDialog/port"), port);
+        settings->setValue("AnalyzerQmlAttachDialog/kitId", kit->id().toSetting());
+        settings->setValue("AnalyzerQmlAttachDialog/port", port);
     }
 
     QUrl serverUrl;
diff --git a/src/plugins/qmlprofiler/tests/qmlprofilertool_test.cpp b/src/plugins/qmlprofiler/tests/qmlprofilertool_test.cpp
index ea119517ff..1b16b42114 100644
--- a/src/plugins/qmlprofiler/tests/qmlprofilertool_test.cpp
+++ b/src/plugins/qmlprofiler/tests/qmlprofilertool_test.cpp
@@ -5,18 +5,24 @@
 #include "fakedebugserver.h"
 
 #include <coreplugin/icore.h>
+
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/runcontrol.h>
+
 #include <qmlprofiler/qmlprofilerattachdialog.h>
 #include <qmlprofiler/qmlprofilerclientmanager.h>
 #include <qmlprofiler/qmlprofilermodelmanager.h>
 #include <qmlprofiler/qmlprofilerstatemanager.h>
+
+#include <utils/qtcsettings.h>
 #include <utils/url.h>
 
 #include <QTcpServer>
 #include <QtTest>
 
+using namespace Utils;
+
 namespace QmlProfiler {
 namespace Internal {
 
@@ -26,9 +32,9 @@ void QmlProfilerToolTest::testAttachToWaitingApplication()
     QVERIFY(kitManager);
     ProjectExplorer::Kit * const newKit = ProjectExplorer::KitManager::registerKit({}, "fookit");
     QVERIFY(newKit);
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     QVERIFY(settings);
-    settings->setValue(QLatin1String("AnalyzerQmlAttachDialog/kitId"), newKit->id().toSetting());
+    settings->setValue("AnalyzerQmlAttachDialog/kitId", newKit->id().toSetting());
 
     QmlProfilerTool &profilerTool = *QmlProfilerTool::instance();
 
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index fd977a2d4c..7ed655b01b 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -209,8 +209,8 @@ Tasks QmlProject::projectIssues(const Kit *k) const
 
 bool QmlProject::isQtDesignStudio()
 {
-    QSettings *settings = Core::ICore::settings();
-    const QString qdsStandaloneEntry = "QML/Designer/StandAloneMode";
+    QtcSettings *settings = Core::ICore::settings();
+    const Key qdsStandaloneEntry = "QML/Designer/StandAloneMode";
     return settings->value(qdsStandaloneEntry, false).toBool();
 }
 
@@ -240,9 +240,9 @@ int QmlProject::preferedQtTarget(Target *target)
 
 bool QmlProject::allowOnlySingleProject()
 {
-    QSettings *settings = Core::ICore::settings();
-    auto key = "QML/Designer/AllowMultipleProjects";
-    return !settings->value(QString::fromUtf8(key), false).toBool();
+    QtcSettings *settings = Core::ICore::settings();
+    const Key key = "QML/Designer/AllowMultipleProjects";
+    return !settings->value(key, false).toBool();
 }
 
 } // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index 2876c3c366..7c12e312b1 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -41,6 +41,7 @@
 #include <utils/fileutils.h>
 #include <utils/fsengine/fileiconprovider.h>
 #include <utils/process.h>
+#include <utils/qtcsettings.h>
 
 #include <QAction>
 #include <QDesktopServices>
@@ -50,6 +51,7 @@
 #include <QTimer>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace QmlProjectManager::Internal {
 
@@ -131,8 +133,8 @@ void QmlProjectPlugin::openQDS(const Utils::FilePath &fileName)
 
 Utils::FilePath QmlProjectPlugin::qdsInstallationEntry()
 {
-    QSettings *settings = Core::ICore::settings();
-    const QString qdsInstallationEntry = "QML/Designer/DesignStudioInstallation"; //set in installer
+    QtcSettings *settings = Core::ICore::settings();
+    const Key qdsInstallationEntry = "QML/Designer/DesignStudioInstallation"; //set in installer
 
     return Utils::FilePath::fromUserInput(settings->value(qdsInstallationEntry).toString());
 }
diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp
index bb2f9e0fa0..e18016834b 100644
--- a/src/plugins/qtsupport/exampleslistmodel.cpp
+++ b/src/plugins/qtsupport/exampleslistmodel.cpp
@@ -68,7 +68,7 @@ ExampleSetModel::ExampleSetModel()
     if (debugExamples() && !log().isDebugEnabled())
         log().setEnabled(QtDebugMsg, true);
     // read extra example sets settings
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     const QStringList list = settings->value("Help/InstalledExamples", QStringList()).toStringList();
     qCDebug(log) << "Reading Help/InstalledExamples from settings:" << list;
     for (const QString &item : list) {
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
index f06f28790d..6d0ead4ac6 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
@@ -10,6 +10,7 @@
 #include <projectexplorer/devicesupport/sshsettings.h>
 
 #include <utils/filepath.h>
+#include <utils/fileutils.h>
 #include <utils/process.h>
 #include <utils/stringutils.h>
 #include <utils/theme/theme.h>
diff --git a/src/plugins/scxmleditor/common/colorsettings.cpp b/src/plugins/scxmleditor/common/colorsettings.cpp
index 1419b481bc..2f84087fa2 100644
--- a/src/plugins/scxmleditor/common/colorsettings.cpp
+++ b/src/plugins/scxmleditor/common/colorsettings.cpp
@@ -12,10 +12,13 @@
 #include <QToolButton>
 
 #include <coreplugin/icore.h>
+
 #include <utils/layoutbuilder.h>
 #include <utils/utilsicons.h>
 
-using namespace ScxmlEditor::Common;
+using namespace Utils;
+
+namespace ScxmlEditor::Common {
 
 ColorSettings::ColorSettings(QWidget *parent)
     : QFrame(parent)
@@ -29,7 +32,7 @@ ColorSettings::ColorSettings(QWidget *parent)
     auto removeTheme = new QToolButton;
     removeTheme->setIcon(Utils::Icons::MINUS.icon());
     removeTheme->setAutoRaise(true);
-    const QSettings *s = Core::ICore::settings();
+    const QtcSettings *s = Core::ICore::settings();
     m_colorThemes = s->value(Constants::C_SETTINGS_COLORSETTINGS_COLORTHEMES).toMap();
     m_comboColorThemes->addItems(m_colorThemes.keys());
     m_comboColorThemes->setCurrentText(
@@ -57,7 +60,7 @@ ColorSettings::ColorSettings(QWidget *parent)
 
 void ColorSettings::save()
 {
-    QSettings *s = Core::ICore::settings();
+    QtcSettings *s = Core::ICore::settings();
     s->setValue(Constants::C_SETTINGS_COLORSETTINGS_COLORTHEMES, m_colorThemes);
     s->setValue(Constants::C_SETTINGS_COLORSETTINGS_CURRENTCOLORTHEME, m_comboColorThemes->currentText());
 }
@@ -110,3 +113,5 @@ void ColorSettings::removeTheme()
             m_colorThemeView->setEnabled(false);
     }
 }
+
+} // ScxmlEditor::Common
diff --git a/src/plugins/scxmleditor/common/colorthemes.cpp b/src/plugins/scxmleditor/common/colorthemes.cpp
index 5a40783a31..6a98572f2e 100644
--- a/src/plugins/scxmleditor/common/colorthemes.cpp
+++ b/src/plugins/scxmleditor/common/colorthemes.cpp
@@ -10,12 +10,16 @@
 #include "scxmltag.h"
 
 #include <coreplugin/icore.h>
+
+#include <utils/qtcsettings.h>
 #include <utils/stringutils.h>
 
 #include <QMenu>
 #include <QToolButton>
 
-using namespace ScxmlEditor::Common;
+using namespace Utils;
+
+namespace ScxmlEditor::Common {
 
 ColorThemes::ColorThemes(QObject *parent)
     : QObject(parent)
@@ -69,7 +73,7 @@ void ColorThemes::updateColorThemeMenu()
 {
     m_menu->clear();
 
-    const QSettings *s = Core::ICore::settings();
+    const QtcSettings *s = Core::ICore::settings();
     const QString currentTheme = s->value(Constants::C_SETTINGS_COLORSETTINGS_CURRENTCOLORTHEME,
                                           QString(Constants::C_COLOR_SCHEME_DEFAULT)).toString();
     const QVariantMap data = s->value(Constants::C_SETTINGS_COLORSETTINGS_COLORTHEMES).toMap();
@@ -100,7 +104,7 @@ void ColorThemes::selectColorTheme(const QString &name)
 {
     QVariantMap colorData;
     if (m_document && !name.isEmpty()) {
-        QSettings *s = Core::ICore::settings();
+        QtcSettings *s = Core::ICore::settings();
 
         if (name == Constants::C_COLOR_SCHEME_SCXMLDOCUMENT) {
             colorData = m_documentColors;
@@ -168,3 +172,5 @@ void ColorThemes::setCurrentColors(const QVariantMap &colorData)
     m_document->setLevelColors(colors);
     m_document->setEditorInfo(m_document->scxmlRootTag(), Constants::C_SCXML_EDITORINFO_COLORS, serializedColors.join(";;"));
 }
+
+} // ScxmlEditor::Common
diff --git a/src/plugins/scxmleditor/common/mainwidget.cpp b/src/plugins/scxmleditor/common/mainwidget.cpp
index 795e183bd6..a55d59f6ad 100644
--- a/src/plugins/scxmleditor/common/mainwidget.cpp
+++ b/src/plugins/scxmleditor/common/mainwidget.cpp
@@ -372,7 +372,7 @@ void MainWidget::init()
 
     m_toolButtons << stateColorButton << fontColorButton << alignToolButton << adjustToolButton;
 
-    const QSettings *s = Core::ICore::settings();
+    const QtcSettings *s = Core::ICore::settings();
     m_horizontalSplitter->restoreState(s->value(Constants::C_SETTINGS_SPLITTER).toByteArray());
 
     m_actionHandler->action(ActionPaste)->setEnabled(false);
@@ -412,7 +412,7 @@ void MainWidget::exportToImage()
     if (suggestedFileName.isEmpty())
         suggestedFileName = Tr::tr("Untitled");
 
-    QSettings *s = Core::ICore::settings();
+    QtcSettings *s = Core::ICore::settings();
     const QString documentsLocation = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
     const QString lastFolder = s->value(
                 Constants::C_SETTINGS_LASTEXPORTFOLDER, documentsLocation).toString();
@@ -446,7 +446,7 @@ void MainWidget::saveScreenShot()
     if (!view)
         return;
 
-    QSettings *s = Core::ICore::settings();
+    QtcSettings *s = Core::ICore::settings();
     const QString documentsLocation = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
     const FilePath lastFolder = FilePath::fromSettings(
             s->value(Constants::C_SETTINGS_LASTSAVESCREENSHOTFOLDER, documentsLocation));
@@ -467,7 +467,7 @@ void MainWidget::saveScreenShot()
 
 void MainWidget::saveSettings()
 {
-    QSettings *s = Core::ICore::settings();
+    QtcSettings *s = Core::ICore::settings();
     s->setValue(Constants::C_SETTINGS_SPLITTER, m_horizontalSplitter->saveState());
 }
 
diff --git a/src/plugins/scxmleditor/outputpane/errorwidget.cpp b/src/plugins/scxmleditor/outputpane/errorwidget.cpp
index b38da63f62..e48fc370ca 100644
--- a/src/plugins/scxmleditor/outputpane/errorwidget.cpp
+++ b/src/plugins/scxmleditor/outputpane/errorwidget.cpp
@@ -73,7 +73,7 @@ ErrorWidget::ErrorWidget(QWidget *parent)
     connect(m_warningModel, &WarningModel::warningsChanged, this, &ErrorWidget::updateWarnings);
     connect(m_warningModel, &WarningModel::countChanged, this, &ErrorWidget::warningCountChanged);
 
-    const QSettings *s = Core::ICore::settings();
+    const QtcSettings *s = Core::ICore::settings();
     m_errorsTable->restoreGeometry(s->value(Constants::C_SETTINGS_ERRORPANE_GEOMETRY).toByteArray());
     m_showErrors->setChecked(s->value(Constants::C_SETTINGS_ERRORPANE_SHOWERRORS, true).toBool());
     m_showWarnings->setChecked(s->value(Constants::C_SETTINGS_ERRORPANE_SHOWWARNINGS, true).toBool());
@@ -84,7 +84,7 @@ ErrorWidget::ErrorWidget(QWidget *parent)
 
 ErrorWidget::~ErrorWidget()
 {
-    QSettings *s = Core::ICore::settings();
+    QtcSettings *s = Core::ICore::settings();
     s->setValue(Constants::C_SETTINGS_ERRORPANE_GEOMETRY, m_errorsTable->saveGeometry());
     s->setValue(Constants::C_SETTINGS_ERRORPANE_SHOWERRORS, m_showErrors->isChecked());
     s->setValue(Constants::C_SETTINGS_ERRORPANE_SHOWWARNINGS, m_showWarnings->isChecked());
diff --git a/src/plugins/serialterminal/serialterminalsettings.cpp b/src/plugins/serialterminal/serialterminalsettings.cpp
index db938ce673..b8f023f93f 100644
--- a/src/plugins/serialterminal/serialterminalsettings.cpp
+++ b/src/plugins/serialterminal/serialterminalsettings.cpp
@@ -5,8 +5,11 @@
 #include "serialterminalconstants.h"
 #include "serialterminaltr.h"
 
+#include <utils/qtcsettings.h>
+
 #include <QLoggingCategory>
-#include <QSettings>
+
+using namespace Utils;
 
 namespace SerialTerminal {
 namespace Internal {
@@ -15,7 +18,7 @@ static Q_LOGGING_CATEGORY(log, Constants::LOGGING_CATEGORY, QtWarningMsg)
 
 // Set 'value' only if the key exists in the settings
 template <typename T>
-void readSetting(const QSettings &settings, T &value, const QString &key) {
+void readSetting(const QtcSettings &settings, T &value, const Key &key) {
     if (settings.contains(key))
         value = settings.value(key).value<T>();
 }
@@ -32,7 +35,7 @@ Settings::Settings()
 }
 
 // Save settings to a QSettings
-void Settings::save(QSettings *settings)
+void Settings::save(QtcSettings *settings)
 {
     if (!settings || !edited)
         return;
@@ -61,7 +64,7 @@ void Settings::save(QSettings *settings)
 }
 
 // Load available settings from a QSettings
-void Settings::load(QSettings *settings)
+void Settings::load(QtcSettings *settings)
 {
     if (!settings)
         return;
@@ -129,7 +132,7 @@ void Settings::setDefaultLineEndingIndex(unsigned int index)
 }
 
 
-void Settings::saveLineEndings(QSettings &settings)
+void Settings::saveLineEndings(QtcSettings &settings)
 {
     settings.beginWriteArray(Constants::SETTINGS_LINE_ENDINGS, lineEndings.size());
     int i = 0;
@@ -141,7 +144,7 @@ void Settings::saveLineEndings(QSettings &settings)
     settings.endArray();
 }
 
-void Settings::loadLineEndings(QSettings &settings)
+void Settings::loadLineEndings(QtcSettings &settings)
 {
     const int size = settings.beginReadArray(Constants::SETTINGS_LINE_ENDINGS);
     if (size > 0) // If null, keep default line endings
diff --git a/src/plugins/serialterminal/serialterminalsettings.h b/src/plugins/serialterminal/serialterminalsettings.h
index b2a4ec84e4..48efdb0806 100644
--- a/src/plugins/serialterminal/serialterminalsettings.h
+++ b/src/plugins/serialterminal/serialterminalsettings.h
@@ -9,9 +9,7 @@
 #include <QString>
 #include <QVector>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+namespace Utils { class QtcSettings; }
 
 namespace SerialTerminal {
 namespace Internal {
@@ -36,8 +34,8 @@ public:
 
     bool clearInputOnSend = false;
 
-    void save(QSettings *settings);
-    void load(QSettings *settings);
+    void save(Utils::QtcSettings *settings);
+    void load(Utils::QtcSettings *settings);
 
     void setBaudRate(qint32 br);
     void setPortName(const QString &name);
@@ -47,8 +45,8 @@ public:
     void setDefaultLineEndingIndex(unsigned int index);
 
 private:
-    void saveLineEndings(QSettings &settings);
-    void loadLineEndings(QSettings &settings);
+    void saveLineEndings(Utils::QtcSettings &settings);
+    void loadLineEndings(Utils::QtcSettings &settings);
 };
 
 } // namespace Internal
diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp
index 728367d1e5..50ceeccdba 100644
--- a/src/plugins/silversearcher/findinfilessilversearcher.cpp
+++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp
@@ -6,14 +6,15 @@
 #include "silversearchertr.h"
 
 #include <texteditor/findinfiles.h>
+
 #include <utils/async.h>
 #include <utils/process.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcsettings.h>
 
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <QSettings>
 
 using namespace Core;
 using namespace SilverSearcher;
@@ -21,11 +22,13 @@ using namespace TextEditor;
 using namespace Utils;
 
 namespace {
-const QLatin1String s_metaCharacters = QLatin1String("+()^$.{}[]|\\");
-const QLatin1String s_searchOptionsString = QLatin1String("SearchOptionsString");
+
+const char s_searchOptionsString[] = "SearchOptionsString";
 
 static QString convertWildcardToRegex(const QString &wildcard)
 {
+    static const QString s_metaCharacters("+()^$.{}[]|\\");
+
     QString regex;
     const int wildcardSize = wildcard.size();
     regex.append('^');
@@ -140,7 +143,7 @@ QWidget *FindInFilesSilverSearcher::widget() const
     return m_widget;
 }
 
-void FindInFilesSilverSearcher::writeSettings(QSettings *settings) const
+void FindInFilesSilverSearcher::writeSettings(QtcSettings *settings) const
 {
     settings->setValue(s_searchOptionsString, m_searchOptionsLineEdit->text());
 }
@@ -152,7 +155,7 @@ SearchExecutor FindInFilesSilverSearcher::searchExecutor() const
     };
 }
 
-void FindInFilesSilverSearcher::readSettings(QSettings *settings)
+void FindInFilesSilverSearcher::readSettings(QtcSettings *settings)
 {
     m_searchOptionsLineEdit->setText(settings->value(s_searchOptionsString).toString());
 }
diff --git a/src/plugins/silversearcher/findinfilessilversearcher.h b/src/plugins/silversearcher/findinfilessilversearcher.h
index 82c32f1422..1819260a0e 100644
--- a/src/plugins/silversearcher/findinfilessilversearcher.h
+++ b/src/plugins/silversearcher/findinfilessilversearcher.h
@@ -28,8 +28,8 @@ public:
     QString title() const override;
     QString toolTip() const override;
     QWidget *widget() const override;
-    void readSettings(QSettings *settings) override;
-    void writeSettings(QSettings *settings) const override;
+    void readSettings(Utils::QtcSettings *settings) override;
+    void writeSettings(Utils::QtcSettings *settings) const override;
     TextEditor::SearchExecutor searchExecutor() const override;
 
 private:
diff --git a/src/plugins/squish/squishnavigationwidget.cpp b/src/plugins/squish/squishnavigationwidget.cpp
index 34077ad255..b6e68aad87 100644
--- a/src/plugins/squish/squishnavigationwidget.cpp
+++ b/src/plugins/squish/squishnavigationwidget.cpp
@@ -24,6 +24,8 @@
 #include <QMenu>
 #include <QVBoxLayout>
 
+using namespace Utils;
+
 namespace Squish::Internal {
 
 const int defaultSectionSize = 17;
@@ -319,13 +321,13 @@ void SquishNavigationWidget::onRemoveAllSharedFolderTriggered()
 
 void SquishNavigationWidget::onRecordTestCase(const QString &suiteName, const QString &testCase)
 {
-    QMessageBox::StandardButton pressed = Utils::CheckableMessageBox::question(
+    QMessageBox::StandardButton pressed = CheckableMessageBox::question(
         Core::ICore::dialogParent(),
         Tr::tr("Record Test Case"),
         Tr::tr("Do you want to record over the test case \"%1\"? The existing content will "
                "be overwritten by the recorded script.")
             .arg(testCase),
-        QString("RecordWithoutApproval"));
+        Key("RecordWithoutApproval"));
     if (pressed != QMessageBox::Yes)
         return;
 
diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
index 2f576b331b..829b761d10 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
@@ -75,8 +75,8 @@ namespace Internal {
 
 static bool useNewWelcomePage()
 {
-    QSettings *settings = Core::ICore::settings();
-    const QString newWelcomePageEntry = "QML/Designer/NewWelcomePage"; //entry from qml settings
+    QtcSettings *settings = Core::ICore::settings();
+    const Key newWelcomePageEntry = "QML/Designer/NewWelcomePage"; //entry from qml settings
 
     return settings->value(newWelcomePageEntry, false).toBool();
 }
@@ -527,9 +527,9 @@ static bool forceDownLoad()
 
 static bool showSplashScreen()
 {
-    const QString lastQDSVersionEntry = "QML/Designer/lastQDSVersion";
+    const Key lastQDSVersionEntry = "QML/Designer/lastQDSVersion";
 
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
 
     const QString lastQDSVersion = settings->value(lastQDSVersionEntry).toString();
 
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index 91c0b8e259..efea4e9ba1 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -140,8 +140,8 @@ public:
     QString title() const override { return Tr::tr("Internal"); }
     QString toolTip() const override { return {}; }
     QWidget *widget() const override { return m_widget; }
-    void readSettings(QSettings * /*settings*/) override {}
-    void writeSettings(QSettings * /*settings*/) const override {}
+    void readSettings(QtcSettings * /*settings*/) override {}
+    void writeSettings(QtcSettings * /*settings*/) const override {}
     SearchExecutor searchExecutor() const override
     {
         return [](const FileFindParameters &parameters) {
@@ -444,7 +444,7 @@ FilePath BaseFileFind::searchDir() const
     return d->m_searchDir;
 }
 
-void BaseFileFind::writeCommonSettings(QSettings *settings)
+void BaseFileFind::writeCommonSettings(QtcSettings *settings)
 {
     const auto fromNativeSeparators = [](const QStringList &files) -> QStringList {
         return Utils::transform(files, &QDir::fromNativeSeparators);
@@ -464,7 +464,7 @@ void BaseFileFind::writeCommonSettings(QSettings *settings)
     settings->setValue("currentSearchEngineIndex", d->m_currentSearchEngineIndex);
 }
 
-void BaseFileFind::readCommonSettings(QSettings *settings, const QString &defaultFilter,
+void BaseFileFind::readCommonSettings(QtcSettings *settings, const QString &defaultFilter,
                                       const QString &defaultExclusionFilter)
 {
     const auto toNativeSeparators = [](const QStringList &files) -> QStringList {
diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h
index c7d53f8033..47adae4b86 100644
--- a/src/plugins/texteditor/basefilefind.h
+++ b/src/plugins/texteditor/basefilefind.h
@@ -69,8 +69,8 @@ public:
     virtual QString title() const = 0;
     virtual QString toolTip() const = 0; // add %1 placeholder where the find flags should be put
     virtual QWidget *widget() const = 0;
-    virtual void readSettings(QSettings *settings) = 0;
-    virtual void writeSettings(QSettings *settings) const = 0;
+    virtual void readSettings(Utils::QtcSettings *settings) = 0;
+    virtual void writeSettings(Utils::QtcSettings *settings) const = 0;
     virtual SearchExecutor searchExecutor() const = 0;
     virtual EditorOpener editorOpener() const { return {}; }
     bool isEnabled() const;
@@ -108,8 +108,8 @@ protected:
     virtual QString toolTip() const = 0; // see Core::SearchResultWindow::startNewSearch,
                                          // add %1 placeholder where the find flags should be put
 
-    void writeCommonSettings(QSettings *settings);
-    void readCommonSettings(QSettings *settings, const QString &defaultFilter, const QString &defaultExclusionFilter);
+    void writeCommonSettings(Utils::QtcSettings *settings);
+    void readCommonSettings(Utils::QtcSettings *settings, const QString &defaultFilter, const QString &defaultExclusionFilter);
     QList<QPair<QWidget *, QWidget *>> createPatternWidgets();
     QStringList fileNameFilters() const;
     QStringList fileExclusionFilters() const;
diff --git a/src/plugins/texteditor/completionsettings.cpp b/src/plugins/texteditor/completionsettings.cpp
index e4d6e76028..033f322a6e 100644
--- a/src/plugins/texteditor/completionsettings.cpp
+++ b/src/plugins/texteditor/completionsettings.cpp
@@ -3,29 +3,31 @@
 
 #include "completionsettings.h"
 
-#include <QSettings>
+#include <utils/qtcsettings.h>
 
-static const char settingsGroup[]               = "CppTools/Completion";
-static const char caseSensitivityKey[]          = "CaseSensitivity";
-static const char completionTriggerKey[]        = "CompletionTrigger";
-static const char automaticProposalTimeoutKey[] = "AutomaticProposalTimeout";
-static const char characterThresholdKey[]       = "CharacterThreshold";
-static const char autoInsertBracesKey[]         = "AutoInsertBraces";
-static const char surroundingAutoBracketsKey[]  = "SurroundingAutoBrackets";
-static const char autoInsertQuotesKey[]         = "AutoInsertQuotes";
-static const char surroundingAutoQuotesKey[]    = "SurroundingAutoQuotes";
-static const char partiallyCompleteKey[]        = "PartiallyComplete";
-static const char spaceAfterFunctionNameKey[]   = "SpaceAfterFunctionName";
-static const char autoSplitStringsKey[]         = "AutoSplitStrings";
-static const char animateAutoCompleteKey[]      = "AnimateAutoComplete";
-static const char highlightAutoCompleteKey[]    = "HighlightAutoComplete";
-static const char skipAutoCompleteKey[]         = "SkipAutoComplete";
-static const char autoRemoveKey[]               = "AutoRemove";
-static const char overwriteClosingCharsKey[]    = "OverwriteClosingChars";
+using namespace Utils;
 
-using namespace TextEditor;
+namespace TextEditor {
 
-void CompletionSettings::toSettings(QSettings *s) const
+const char settingsGroup[]               = "CppTools/Completion";
+const char caseSensitivityKey[]          = "CaseSensitivity";
+const char completionTriggerKey[]        = "CompletionTrigger";
+const char automaticProposalTimeoutKey[] = "AutomaticProposalTimeout";
+const char characterThresholdKey[]       = "CharacterThreshold";
+const char autoInsertBracesKey[]         = "AutoInsertBraces";
+const char surroundingAutoBracketsKey[]  = "SurroundingAutoBrackets";
+const char autoInsertQuotesKey[]         = "AutoInsertQuotes";
+const char surroundingAutoQuotesKey[]    = "SurroundingAutoQuotes";
+const char partiallyCompleteKey[]        = "PartiallyComplete";
+const char spaceAfterFunctionNameKey[]   = "SpaceAfterFunctionName";
+const char autoSplitStringsKey[]         = "AutoSplitStrings";
+const char animateAutoCompleteKey[]      = "AnimateAutoComplete";
+const char highlightAutoCompleteKey[]    = "HighlightAutoComplete";
+const char skipAutoCompleteKey[]         = "SkipAutoComplete";
+const char autoRemoveKey[]               = "AutoRemove";
+const char overwriteClosingCharsKey[]    = "OverwriteClosingChars";
+
+void CompletionSettings::toSettings(QtcSettings *s) const
 {
     s->beginGroup(settingsGroup);
     s->setValue(caseSensitivityKey, (int) m_caseSensitivity);
@@ -47,7 +49,7 @@ void CompletionSettings::toSettings(QSettings *s) const
     s->endGroup();
 }
 
-void CompletionSettings::fromSettings(QSettings *s)
+void CompletionSettings::fromSettings(QtcSettings *s)
 {
     *this = CompletionSettings(); // Assign defaults
 
@@ -107,3 +109,5 @@ bool CompletionSettings::equals(const CompletionSettings &cs) const
         && m_overwriteClosingChars          == cs.m_overwriteClosingChars
         ;
 }
+
+} // TextEditor
diff --git a/src/plugins/texteditor/completionsettings.h b/src/plugins/texteditor/completionsettings.h
index b2d201e897..61294e65ad 100644
--- a/src/plugins/texteditor/completionsettings.h
+++ b/src/plugins/texteditor/completionsettings.h
@@ -5,10 +5,7 @@
 
 #include "texteditor_global.h"
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
-
+namespace Utils { class QtcSettings; }
 namespace TextEditor {
 
 enum CaseSensitivity {
@@ -29,8 +26,8 @@ enum CompletionTrigger {
 class TEXTEDITOR_EXPORT CompletionSettings
 {
 public:
-    void toSettings(QSettings *s) const;
-    void fromSettings(QSettings *s);
+    void toSettings(Utils::QtcSettings *s) const;
+    void fromSettings(Utils::QtcSettings *s);
 
     bool equals(const CompletionSettings &bs) const;
 
diff --git a/src/plugins/texteditor/completionsettingspage.cpp b/src/plugins/texteditor/completionsettingspage.cpp
index 3d93af5226..aba8646714 100644
--- a/src/plugins/texteditor/completionsettingspage.cpp
+++ b/src/plugins/texteditor/completionsettingspage.cpp
@@ -313,7 +313,7 @@ CompletionSettingsPage::CompletionSettingsPage()
     setCategoryIconPath(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON_PATH);
     setWidgetCreator([this] { return new CompletionSettingsPageWidget(this); });
 
-    QSettings *s = Core::ICore::settings();
+    QtcSettings *s = Core::ICore::settings();
     m_completionSettings.fromSettings(s);
 }
 
diff --git a/src/plugins/texteditor/displaysettings.cpp b/src/plugins/texteditor/displaysettings.cpp
index fde9774cf3..5cd8e86c15 100644
--- a/src/plugins/texteditor/displaysettings.cpp
+++ b/src/plugins/texteditor/displaysettings.cpp
@@ -6,90 +6,92 @@
 #include "texteditorconstants.h"
 
 #include <coreplugin/icore.h>
+
+#include <utils/qtcsettings.h>
 #include <utils/tooltip/tooltip.h>
 
 #include <QLabel>
-#include <QSettings>
-#include <QString>
 
-static const char displayLineNumbersKey[] = "DisplayLineNumbers";
-static const char textWrappingKey[] = "TextWrapping";
-static const char visualizeWhitespaceKey[] = "VisualizeWhitespace";
-static const char visualizeIndentKey[] = "VisualizeIndent";
-static const char displayFoldingMarkersKey[] = "DisplayFoldingMarkers";
-static const char highlightCurrentLineKey[] = "HighlightCurrentLine2Key";
-static const char highlightBlocksKey[] = "HighlightBlocksKey";
-static const char animateMatchingParenthesesKey[] = "AnimateMatchingParenthesesKey";
-static const char highlightMatchingParenthesesKey[] = "HightlightMatchingParenthesesKey";
-static const char markTextChangesKey[] = "MarkTextChanges";
-static const char autoFoldFirstCommentKey[] = "AutoFoldFirstComment";
-static const char centerCursorOnScrollKey[] = "CenterCursorOnScroll";
-static const char openLinksInNextSplitKey[] = "OpenLinksInNextSplitKey";
-static const char displayFileEncodingKey[] = "DisplayFileEncoding";
-static const char displayFileLineEndingKey[] = "DisplayFileLineEnding";
-static const char scrollBarHighlightsKey[] = "ScrollBarHighlights";
-static const char animateNavigationWithinFileKey[] = "AnimateNavigationWithinFile";
-static const char animateWithinFileTimeMaxKey[] = "AnimateWithinFileTimeMax";
-static const char displayAnnotationsKey[] = "DisplayAnnotations";
-static const char annotationAlignmentKey[] = "AnnotationAlignment";
-static const char minimalAnnotationContentKey[] = "MinimalAnnotationContent";
-static const char groupPostfix[] = "textDisplaySettings";
+using namespace Utils;
 
 namespace TextEditor {
 
-void DisplaySettings::toSettings(QSettings *s) const
+const char displayLineNumbersKey[] = "DisplayLineNumbers";
+const char textWrappingKey[] = "TextWrapping";
+const char visualizeWhitespaceKey[] = "VisualizeWhitespace";
+const char visualizeIndentKey[] = "VisualizeIndent";
+const char displayFoldingMarkersKey[] = "DisplayFoldingMarkers";
+const char highlightCurrentLineKey[] = "HighlightCurrentLine2Key";
+const char highlightBlocksKey[] = "HighlightBlocksKey";
+const char animateMatchingParenthesesKey[] = "AnimateMatchingParenthesesKey";
+const char highlightMatchingParenthesesKey[] = "HightlightMatchingParenthesesKey";
+const char markTextChangesKey[] = "MarkTextChanges";
+const char autoFoldFirstCommentKey[] = "AutoFoldFirstComment";
+const char centerCursorOnScrollKey[] = "CenterCursorOnScroll";
+const char openLinksInNextSplitKey[] = "OpenLinksInNextSplitKey";
+const char displayFileEncodingKey[] = "DisplayFileEncoding";
+const char displayFileLineEndingKey[] = "DisplayFileLineEnding";
+const char scrollBarHighlightsKey[] = "ScrollBarHighlights";
+const char animateNavigationWithinFileKey[] = "AnimateNavigationWithinFile";
+const char animateWithinFileTimeMaxKey[] = "AnimateWithinFileTimeMax";
+const char displayAnnotationsKey[] = "DisplayAnnotations";
+const char annotationAlignmentKey[] = "AnnotationAlignment";
+const char minimalAnnotationContentKey[] = "MinimalAnnotationContent";
+const char groupPostfix[] = "textDisplaySettings";
+
+void DisplaySettings::toSettings(QtcSettings *s) const
 {
     s->beginGroup(groupPostfix);
-    s->setValue(QLatin1String(displayLineNumbersKey), m_displayLineNumbers);
-    s->setValue(QLatin1String(textWrappingKey), m_textWrapping);
-    s->setValue(QLatin1String(visualizeWhitespaceKey), m_visualizeWhitespace);
-    s->setValue(QLatin1String(visualizeIndentKey), m_visualizeIndent);
-    s->setValue(QLatin1String(displayFoldingMarkersKey), m_displayFoldingMarkers);
-    s->setValue(QLatin1String(highlightCurrentLineKey), m_highlightCurrentLine);
-    s->setValue(QLatin1String(highlightBlocksKey), m_highlightBlocks);
-    s->setValue(QLatin1String(animateMatchingParenthesesKey), m_animateMatchingParentheses);
-    s->setValue(QLatin1String(highlightMatchingParenthesesKey), m_highlightMatchingParentheses);
-    s->setValue(QLatin1String(markTextChangesKey), m_markTextChanges);
-    s->setValue(QLatin1String(autoFoldFirstCommentKey), m_autoFoldFirstComment);
-    s->setValue(QLatin1String(centerCursorOnScrollKey), m_centerCursorOnScroll);
-    s->setValue(QLatin1String(openLinksInNextSplitKey), m_openLinksInNextSplit);
-    s->setValue(QLatin1String(displayFileEncodingKey), m_displayFileEncoding);
-    s->setValue(QLatin1String(displayFileLineEndingKey), m_displayFileLineEnding);
-    s->setValue(QLatin1String(scrollBarHighlightsKey), m_scrollBarHighlights);
-    s->setValue(QLatin1String(animateNavigationWithinFileKey), m_animateNavigationWithinFile);
-    s->setValue(QLatin1String(displayAnnotationsKey), m_displayAnnotations);
-    s->setValue(QLatin1String(annotationAlignmentKey), static_cast<int>(m_annotationAlignment));
+    s->setValue(displayLineNumbersKey, m_displayLineNumbers);
+    s->setValue(textWrappingKey, m_textWrapping);
+    s->setValue(visualizeWhitespaceKey, m_visualizeWhitespace);
+    s->setValue(visualizeIndentKey, m_visualizeIndent);
+    s->setValue(displayFoldingMarkersKey, m_displayFoldingMarkers);
+    s->setValue(highlightCurrentLineKey, m_highlightCurrentLine);
+    s->setValue(highlightBlocksKey, m_highlightBlocks);
+    s->setValue(animateMatchingParenthesesKey, m_animateMatchingParentheses);
+    s->setValue(highlightMatchingParenthesesKey, m_highlightMatchingParentheses);
+    s->setValue(markTextChangesKey, m_markTextChanges);
+    s->setValue(autoFoldFirstCommentKey, m_autoFoldFirstComment);
+    s->setValue(centerCursorOnScrollKey, m_centerCursorOnScroll);
+    s->setValue(openLinksInNextSplitKey, m_openLinksInNextSplit);
+    s->setValue(displayFileEncodingKey, m_displayFileEncoding);
+    s->setValue(displayFileLineEndingKey, m_displayFileLineEnding);
+    s->setValue(scrollBarHighlightsKey, m_scrollBarHighlights);
+    s->setValue(animateNavigationWithinFileKey, m_animateNavigationWithinFile);
+    s->setValue(displayAnnotationsKey, m_displayAnnotations);
+    s->setValue(annotationAlignmentKey, static_cast<int>(m_annotationAlignment));
     s->endGroup();
 }
 
-void DisplaySettings::fromSettings(QSettings *s)
+void DisplaySettings::fromSettings(QtcSettings *s)
 {
     s->beginGroup(groupPostfix);
     *this = DisplaySettings(); // Assign defaults
 
-    m_displayLineNumbers = s->value(QLatin1String(displayLineNumbersKey), m_displayLineNumbers).toBool();
-    m_textWrapping = s->value(QLatin1String(textWrappingKey), m_textWrapping).toBool();
-    m_visualizeWhitespace = s->value(QLatin1String(visualizeWhitespaceKey), m_visualizeWhitespace).toBool();
-    m_visualizeIndent = s->value(QLatin1String(visualizeIndentKey), m_visualizeIndent).toBool();
-    m_displayFoldingMarkers = s->value(QLatin1String(displayFoldingMarkersKey), m_displayFoldingMarkers).toBool();
-    m_highlightCurrentLine = s->value(QLatin1String(highlightCurrentLineKey), m_highlightCurrentLine).toBool();
-    m_highlightBlocks = s->value(QLatin1String(highlightBlocksKey), m_highlightBlocks).toBool();
-    m_animateMatchingParentheses = s->value(QLatin1String(animateMatchingParenthesesKey), m_animateMatchingParentheses).toBool();
-    m_highlightMatchingParentheses = s->value(QLatin1String(highlightMatchingParenthesesKey), m_highlightMatchingParentheses).toBool();
-    m_markTextChanges = s->value(QLatin1String(markTextChangesKey), m_markTextChanges).toBool();
-    m_autoFoldFirstComment = s->value(QLatin1String(autoFoldFirstCommentKey), m_autoFoldFirstComment).toBool();
-    m_centerCursorOnScroll = s->value(QLatin1String(centerCursorOnScrollKey), m_centerCursorOnScroll).toBool();
-    m_openLinksInNextSplit = s->value(QLatin1String(openLinksInNextSplitKey), m_openLinksInNextSplit).toBool();
-    m_displayFileEncoding = s->value(QLatin1String(displayFileEncodingKey), m_displayFileEncoding).toBool();
-    m_displayFileLineEnding = s->value(QLatin1String(displayFileLineEndingKey), m_displayFileLineEnding).toBool();
-    m_scrollBarHighlights = s->value(QLatin1String(scrollBarHighlightsKey), m_scrollBarHighlights).toBool();
-    m_animateNavigationWithinFile = s->value(QLatin1String(animateNavigationWithinFileKey), m_animateNavigationWithinFile).toBool();
-    m_animateWithinFileTimeMax = s->value(QLatin1String(animateWithinFileTimeMaxKey), m_animateWithinFileTimeMax).toInt();
-    m_displayAnnotations = s->value(QLatin1String(displayAnnotationsKey), m_displayAnnotations).toBool();
+    m_displayLineNumbers = s->value(displayLineNumbersKey, m_displayLineNumbers).toBool();
+    m_textWrapping = s->value(textWrappingKey, m_textWrapping).toBool();
+    m_visualizeWhitespace = s->value(visualizeWhitespaceKey, m_visualizeWhitespace).toBool();
+    m_visualizeIndent = s->value(visualizeIndentKey, m_visualizeIndent).toBool();
+    m_displayFoldingMarkers = s->value(displayFoldingMarkersKey, m_displayFoldingMarkers).toBool();
+    m_highlightCurrentLine = s->value(highlightCurrentLineKey, m_highlightCurrentLine).toBool();
+    m_highlightBlocks = s->value(highlightBlocksKey, m_highlightBlocks).toBool();
+    m_animateMatchingParentheses = s->value(animateMatchingParenthesesKey, m_animateMatchingParentheses).toBool();
+    m_highlightMatchingParentheses = s->value(highlightMatchingParenthesesKey, m_highlightMatchingParentheses).toBool();
+    m_markTextChanges = s->value(markTextChangesKey, m_markTextChanges).toBool();
+    m_autoFoldFirstComment = s->value(autoFoldFirstCommentKey, m_autoFoldFirstComment).toBool();
+    m_centerCursorOnScroll = s->value(centerCursorOnScrollKey, m_centerCursorOnScroll).toBool();
+    m_openLinksInNextSplit = s->value(openLinksInNextSplitKey, m_openLinksInNextSplit).toBool();
+    m_displayFileEncoding = s->value(displayFileEncodingKey, m_displayFileEncoding).toBool();
+    m_displayFileLineEnding = s->value(displayFileLineEndingKey, m_displayFileLineEnding).toBool();
+    m_scrollBarHighlights = s->value(scrollBarHighlightsKey, m_scrollBarHighlights).toBool();
+    m_animateNavigationWithinFile = s->value(animateNavigationWithinFileKey, m_animateNavigationWithinFile).toBool();
+    m_animateWithinFileTimeMax = s->value(animateWithinFileTimeMaxKey, m_animateWithinFileTimeMax).toInt();
+    m_displayAnnotations = s->value(displayAnnotationsKey, m_displayAnnotations).toBool();
     m_annotationAlignment = static_cast<TextEditor::AnnotationAlignment>(
-                s->value(QLatin1String(annotationAlignmentKey),
+                s->value(annotationAlignmentKey,
                          static_cast<int>(m_annotationAlignment)).toInt());
-    m_minimalAnnotationContent = s->value(QLatin1String(minimalAnnotationContentKey), m_minimalAnnotationContent).toInt();
+    m_minimalAnnotationContent = s->value(minimalAnnotationContentKey, m_minimalAnnotationContent).toInt();
     s->endGroup();
 }
 
diff --git a/src/plugins/texteditor/displaysettings.h b/src/plugins/texteditor/displaysettings.h
index 635a17b248..1c8a27f037 100644
--- a/src/plugins/texteditor/displaysettings.h
+++ b/src/plugins/texteditor/displaysettings.h
@@ -8,10 +8,11 @@
 #include "QMetaType"
 
 QT_BEGIN_NAMESPACE
-class QSettings;
 class QLabel;
 QT_END_NAMESPACE
 
+namespace Utils { class QtcSettings; }
+
 namespace TextEditor {
 
 enum class AnnotationAlignment
@@ -27,8 +28,8 @@ class TEXTEDITOR_EXPORT DisplaySettings
 public:
     DisplaySettings() = default;
 
-    void toSettings(QSettings *s) const;
-    void fromSettings(QSettings *s);
+    void toSettings(Utils::QtcSettings *s) const;
+    void fromSettings(Utils::QtcSettings *s);
 
     friend bool operator==(const DisplaySettings &t1, const DisplaySettings &t2) { return t1.equals(t2); }
     friend bool operator!=(const DisplaySettings &t1, const DisplaySettings &t2) { return !t1.equals(t2); }
diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp
index d26b3cea2b..b3f749977a 100644
--- a/src/plugins/texteditor/findincurrentfile.cpp
+++ b/src/plugins/texteditor/findincurrentfile.cpp
@@ -9,7 +9,7 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>
 
-#include <QSettings>
+#include <utils/qtcsettings.h>
 
 using namespace Utils;
 
@@ -73,17 +73,16 @@ void FindInCurrentFile::handleFileChange(Core::IEditor *editor)
     }
 }
 
-
-void FindInCurrentFile::writeSettings(QSettings *settings)
+void FindInCurrentFile::writeSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String("FindInCurrentFile"));
+    settings->beginGroup("FindInCurrentFile");
     writeCommonSettings(settings);
     settings->endGroup();
 }
 
-void FindInCurrentFile::readSettings(QSettings *settings)
+void FindInCurrentFile::readSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String("FindInCurrentFile"));
+    settings->beginGroup("FindInCurrentFile");
     readCommonSettings(settings, "*", "");
     settings->endGroup();
 }
diff --git a/src/plugins/texteditor/findincurrentfile.h b/src/plugins/texteditor/findincurrentfile.h
index 7b0b17712c..e551db0b7f 100644
--- a/src/plugins/texteditor/findincurrentfile.h
+++ b/src/plugins/texteditor/findincurrentfile.h
@@ -25,8 +25,8 @@ public:
     QString id() const override;
     QString displayName() const override;
     bool isEnabled() const override;
-    void writeSettings(QSettings *settings) override;
-    void readSettings(QSettings *settings) override;
+    void writeSettings(Utils::QtcSettings *settings) override;
+    void readSettings(Utils::QtcSettings *settings) override;
 
 protected:
     QString label() const override;
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index d780d1b1fb..3fa4de9b59 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -174,16 +174,16 @@ QWidget *FindInFiles::createConfigWidget()
     return m_configWidget;
 }
 
-void FindInFiles::writeSettings(QSettings *settings)
+void FindInFiles::writeSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String("FindInFiles"));
+    settings->beginGroup("FindInFiles");
     writeCommonSettings(settings);
     settings->endGroup();
 }
 
-void FindInFiles::readSettings(QSettings *settings)
+void FindInFiles::readSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String("FindInFiles"));
+    settings->beginGroup("FindInFiles");
     readCommonSettings(settings, "*.cpp,*.h", "*/.git/*,*/.cvs/*,*/.svn/*,*.autosave");
     settings->endGroup();
 }
diff --git a/src/plugins/texteditor/findinfiles.h b/src/plugins/texteditor/findinfiles.h
index 8510d99a51..49c78d2a74 100644
--- a/src/plugins/texteditor/findinfiles.h
+++ b/src/plugins/texteditor/findinfiles.h
@@ -12,7 +12,10 @@ class QComboBox;
 class QStackedWidget;
 QT_END_NAMESPACE
 
-namespace Utils { class PathChooser; }
+namespace Utils {
+class PathChooser;
+class QtcSettings;
+} // Utils
 
 namespace TextEditor {
 
@@ -27,8 +30,8 @@ public:
     QString id() const override;
     QString displayName() const override;
     QWidget *createConfigWidget() override;
-    void writeSettings(QSettings *settings) override;
-    void readSettings(QSettings *settings) override;
+    void writeSettings(Utils::QtcSettings *settings) override;
+    void readSettings(Utils::QtcSettings *settings) override;
     bool isValid() const override;
 
     void setDirectory(const Utils::FilePath &directory);
diff --git a/src/plugins/texteditor/findinopenfiles.cpp b/src/plugins/texteditor/findinopenfiles.cpp
index f4449ea3fc..52c04d3b1d 100644
--- a/src/plugins/texteditor/findinopenfiles.cpp
+++ b/src/plugins/texteditor/findinopenfiles.cpp
@@ -9,7 +9,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/documentmodel.h>
 
-#include <QSettings>
+#include <utils/qtcsettings.h>
 
 using namespace Utils;
 
@@ -70,16 +70,16 @@ bool FindInOpenFiles::isEnabled() const
     return Core::DocumentModel::entryCount() > 0;
 }
 
-void FindInOpenFiles::writeSettings(QSettings *settings)
+void FindInOpenFiles::writeSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String("FindInOpenFiles"));
+    settings->beginGroup("FindInOpenFiles");
     writeCommonSettings(settings);
     settings->endGroup();
 }
 
-void FindInOpenFiles::readSettings(QSettings *settings)
+void FindInOpenFiles::readSettings(QtcSettings *settings)
 {
-    settings->beginGroup(QLatin1String("FindInOpenFiles"));
+    settings->beginGroup("FindInOpenFiles");
     readCommonSettings(settings, "*", "");
     settings->endGroup();
 }
diff --git a/src/plugins/texteditor/findinopenfiles.h b/src/plugins/texteditor/findinopenfiles.h
index 969a5ea531..8e2f42695a 100644
--- a/src/plugins/texteditor/findinopenfiles.h
+++ b/src/plugins/texteditor/findinopenfiles.h
@@ -18,8 +18,8 @@ public:
     QString id() const override;
     QString displayName() const override;
     bool isEnabled() const override;
-    void writeSettings(QSettings *settings) override;
-    void readSettings(QSettings *settings) override;
+    void writeSettings(Utils::QtcSettings *settings) override;
+    void readSettings(Utils::QtcSettings *settings) override;
 
 protected:
     QString label() const override;
diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp
index 873be0ae78..c9c0a95fed 100644
--- a/src/plugins/texteditor/fontsettings.cpp
+++ b/src/plugins/texteditor/fontsettings.cpp
@@ -56,57 +56,57 @@ void FontSettings::clear()
     clearCaches();
 }
 
-static QString settingsGroup()
+static Key settingsGroup()
 {
-    return Utils::settingsKey(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY);
+    return keyFromString(Utils::settingsKey(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY));
 }
 
-void FontSettings::toSettings(QSettings *s) const
+void FontSettings::toSettings(QtcSettings *s) const
 {
     s->beginGroup(settingsGroup());
-    if (m_family != defaultFixedFontFamily() || s->contains(QLatin1String(fontFamilyKey)))
-        s->setValue(QLatin1String(fontFamilyKey), m_family);
+    if (m_family != defaultFixedFontFamily() || s->contains(fontFamilyKey))
+        s->setValue(fontFamilyKey, m_family);
 
-    if (m_fontSize != defaultFontSize() || s->contains(QLatin1String(fontSizeKey)))
-        s->setValue(QLatin1String(fontSizeKey), m_fontSize);
+    if (m_fontSize != defaultFontSize() || s->contains(fontSizeKey))
+        s->setValue(fontSizeKey, m_fontSize);
 
-    if (m_fontZoom!= 100 || s->contains(QLatin1String(fontZoomKey)))
-        s->setValue(QLatin1String(fontZoomKey), m_fontZoom);
+    if (m_fontZoom!= 100 || s->contains(fontZoomKey))
+        s->setValue(fontZoomKey, m_fontZoom);
 
-    if (m_lineSpacing != 100 || s->contains(QLatin1String(lineSpacingKey)))
-        s->setValue(QLatin1String(lineSpacingKey), m_lineSpacing);
+    if (m_lineSpacing != 100 || s->contains(lineSpacingKey))
+        s->setValue(lineSpacingKey, m_lineSpacing);
 
-    if (m_antialias != DEFAULT_ANTIALIAS || s->contains(QLatin1String(antialiasKey)))
-        s->setValue(QLatin1String(antialiasKey), m_antialias);
+    if (m_antialias != DEFAULT_ANTIALIAS || s->contains(antialiasKey))
+        s->setValue(antialiasKey, m_antialias);
 
-    auto schemeFileNames = s->value(QLatin1String(schemeFileNamesKey)).toMap();
+    auto schemeFileNames = s->value(schemeFileNamesKey).toMap();
     if (m_schemeFileName != defaultSchemeFileName() || schemeFileNames.contains(Utils::creatorTheme()->id())) {
         schemeFileNames.insert(Utils::creatorTheme()->id(), m_schemeFileName.toSettings());
-        s->setValue(QLatin1String(schemeFileNamesKey), schemeFileNames);
+        s->setValue(schemeFileNamesKey, schemeFileNames);
     }
 
     s->endGroup();
 }
 
-bool FontSettings::fromSettings(const FormatDescriptions &descriptions, const QSettings *s)
+bool FontSettings::fromSettings(const FormatDescriptions &descriptions, const QtcSettings *s)
 {
     clear();
 
-    QString group = settingsGroup();
-    if (!s->childGroups().contains(group))
+    Key group = settingsGroup();
+    if (!s->childGroups().contains(stringFromKey(group)))
         return false;
 
-    group += QLatin1Char('/');
+    group = group + '/';
 
-    m_family = s->value(group + QLatin1String(fontFamilyKey), defaultFixedFontFamily()).toString();
-    m_fontSize = s->value(group + QLatin1String(fontSizeKey), m_fontSize).toInt();
-    m_fontZoom= s->value(group + QLatin1String(fontZoomKey), m_fontZoom).toInt();
-    m_lineSpacing = s->value(group + QLatin1String(lineSpacingKey), m_lineSpacing).toInt();
-    m_antialias = s->value(group + QLatin1String(antialiasKey), DEFAULT_ANTIALIAS).toBool();
+    m_family = s->value(group + fontFamilyKey, defaultFixedFontFamily()).toString();
+    m_fontSize = s->value(group + fontSizeKey, m_fontSize).toInt();
+    m_fontZoom= s->value(group + fontZoomKey, m_fontZoom).toInt();
+    m_lineSpacing = s->value(group + lineSpacingKey, m_lineSpacing).toInt();
+    m_antialias = s->value(group + antialiasKey, DEFAULT_ANTIALIAS).toBool();
 
-    if (s->contains(group + QLatin1String(schemeFileNamesKey))) {
+    if (s->contains(group + schemeFileNamesKey)) {
         // Load the selected color scheme for the current theme
-        auto schemeFileNames = s->value(group + QLatin1String(schemeFileNamesKey)).toMap();
+        auto schemeFileNames = s->value(group + schemeFileNamesKey).toMap();
         if (schemeFileNames.contains(Utils::creatorTheme()->id())) {
             const FilePath scheme = FilePath::fromSettings(schemeFileNames.value(Utils::creatorTheme()->id()));
             loadColorScheme(scheme, descriptions);
diff --git a/src/plugins/texteditor/fontsettings.h b/src/plugins/texteditor/fontsettings.h
index 44cb074c49..c6924128b0 100644
--- a/src/plugins/texteditor/fontsettings.h
+++ b/src/plugins/texteditor/fontsettings.h
@@ -17,10 +17,11 @@
 #include <QVector>
 
 QT_BEGIN_NAMESPACE
-class QSettings;
 class QFont;
 QT_END_NAMESPACE
 
+namespace Utils { class QtcSettings; }
+
 namespace TextEditor {
 
 class FormatDescription;
@@ -37,10 +38,10 @@ public:
     void clear();
     inline bool isEmpty() const { return m_scheme.isEmpty(); }
 
-    void toSettings(QSettings *s) const;
+    void toSettings(Utils::QtcSettings *s) const;
 
     bool fromSettings(const FormatDescriptions &descriptions,
-                      const QSettings *s);
+                      const Utils::QtcSettings *s);
 
     QVector<QTextCharFormat> toTextCharFormats(const QVector<TextStyle> &categories) const;
     QTextCharFormat toTextCharFormat(TextStyle category) const;
diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp
index 4488986405..369389a513 100644
--- a/src/plugins/texteditor/fontsettingspage.cpp
+++ b/src/plugins/texteditor/fontsettingspage.cpp
@@ -767,7 +767,7 @@ void FontSettingsPageWidget::finish()
 
 FontSettingsPage::FontSettingsPage(FontSettings *fontSettings, const FormatDescriptions &fd)
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     if (settings)
        fontSettings->fromSettings(fd, settings);
 
diff --git a/src/plugins/texteditor/highlighter.cpp b/src/plugins/texteditor/highlighter.cpp
index 4512b71910..cc7bc395bd 100644
--- a/src/plugins/texteditor/highlighter.cpp
+++ b/src/plugins/texteditor/highlighter.cpp
@@ -138,10 +138,10 @@ Highlighter::Definitions Highlighter::definitionsForDocument(const TextDocument
     return definitions;
 }
 
-static Highlighter::Definition definitionForSetting(const QString &settingsKey,
+static Highlighter::Definition definitionForSetting(const Key &settingsKey,
                                                     const QString &mapKey)
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(Constants::HIGHLIGHTER_SETTINGS_CATEGORY);
     const QString &definitionName = settings->value(settingsKey).toMap().value(mapKey).toString();
     settings->endGroup();
@@ -188,23 +188,23 @@ void Highlighter::rememberDefinitionForDocument(const Highlighter::Definition &d
     const QString &mimeType = document->mimeType();
     const FilePath &path = document->filePath();
     const QString &fileExtension = path.completeSuffix();
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(Constants::HIGHLIGHTER_SETTINGS_CATEGORY);
     const Definitions &fileNameDefinitions = definitionsForFileName(path);
     if (fileNameDefinitions.contains(definition)) {
         if (!fileExtension.isEmpty()) {
-            const QString id(kDefinitionForExtension);
+            const Key id(kDefinitionForExtension);
             QMap<QString, QVariant> map = settings->value(id).toMap();
             map.insert(fileExtension, definition.name());
             settings->setValue(id, map);
         } else if (!path.isEmpty()) {
-            const QString id(kDefinitionForFilePath);
+            const Key id(kDefinitionForFilePath);
             QMap<QString, QVariant> map = settings->value(id).toMap();
             map.insert(path.absoluteFilePath().toString(), definition.name());
             settings->setValue(id, map);
         }
     } else if (!mimeType.isEmpty()) {
-        const QString id(kDefinitionForMimeType);
+        const Key id(kDefinitionForMimeType);
         QMap<QString, QVariant> map = settings->value(id).toMap();
         map.insert(mimeType, definition.name());
         settings->setValue(id, map);
@@ -214,7 +214,7 @@ void Highlighter::rememberDefinitionForDocument(const Highlighter::Definition &d
 
 void Highlighter::clearDefinitionForDocumentCache()
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(Constants::HIGHLIGHTER_SETTINGS_CATEGORY);
     settings->remove(kDefinitionForMimeType);
     settings->remove(kDefinitionForExtension);
@@ -227,7 +227,8 @@ void Highlighter::addCustomHighlighterPath(const FilePath &path)
     highlightRepository()->addCustomSearchPath(path.toString());
 }
 
-void Highlighter::downloadDefinitions(std::function<void()> callback) {
+void Highlighter::downloadDefinitions(std::function<void()> callback)
+{
     auto downloader =
         new KSyntaxHighlighting::DefinitionDownloader(highlightRepository());
     connect(downloader, &KSyntaxHighlighting::DefinitionDownloader::done, [downloader, callback]() {
diff --git a/src/plugins/texteditor/highlightersettings.cpp b/src/plugins/texteditor/highlightersettings.cpp
index 095295162a..b93faa7610 100644
--- a/src/plugins/texteditor/highlightersettings.cpp
+++ b/src/plugins/texteditor/highlightersettings.cpp
@@ -7,34 +7,34 @@
 
 #include <coreplugin/icore.h>
 
-#include <QSettings>
+#include <utils/qtcsettings.h>
 
 using namespace Utils;
 
 namespace TextEditor {
 
-const QLatin1String kDefinitionFilesPath("UserDefinitionFilesPath");
-const QLatin1String kIgnoredFilesPatterns("IgnoredFilesPatterns");
+const char kDefinitionFilesPath[] = "UserDefinitionFilesPath";
+const char kIgnoredFilesPatterns[] = "IgnoredFilesPatterns";
 
-static QString groupSpecifier(const QString &postFix, const QString &category)
+static Key groupSpecifier(const Key &postFix, const Key &category)
 {
     if (category.isEmpty())
         return postFix;
-    return QString(category + postFix);
+    return Key(category + postFix);
 }
 
-void HighlighterSettings::toSettings(const QString &category, QSettings *s) const
+void HighlighterSettings::toSettings(const Key &category, QtcSettings *s) const
 {
-    const QString &group = groupSpecifier(Constants::HIGHLIGHTER_SETTINGS_CATEGORY, category);
+    const Key group = groupSpecifier(Constants::HIGHLIGHTER_SETTINGS_CATEGORY, category);
     s->beginGroup(group);
     s->setValue(kDefinitionFilesPath, m_definitionFilesPath.toSettings());
     s->setValue(kIgnoredFilesPatterns, ignoredFilesPatterns());
     s->endGroup();
 }
 
-void HighlighterSettings::fromSettings(const QString &category, QSettings *s)
+void HighlighterSettings::fromSettings(const Key &category, QtcSettings *s)
 {
-    const QString &group = groupSpecifier(Constants::HIGHLIGHTER_SETTINGS_CATEGORY, category);
+    const Key group = groupSpecifier(Constants::HIGHLIGHTER_SETTINGS_CATEGORY, category);
     s->beginGroup(group);
     m_definitionFilesPath = FilePath::fromSettings(s->value(kDefinitionFilesPath));
     if (!s->contains(kDefinitionFilesPath))
diff --git a/src/plugins/texteditor/highlightersettings.h b/src/plugins/texteditor/highlightersettings.h
index adbe828bfb..4082901c99 100644
--- a/src/plugins/texteditor/highlightersettings.h
+++ b/src/plugins/texteditor/highlightersettings.h
@@ -10,9 +10,10 @@
 #include <QList>
 #include <QRegularExpression>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+namespace Utils {
+class Key;
+class QtcSettings;
+} // Utils
 
 namespace TextEditor {
 
@@ -21,8 +22,8 @@ class HighlighterSettings
 public:
     HighlighterSettings() = default;
 
-    void toSettings(const QString &category, QSettings *s) const;
-    void fromSettings(const QString &category, QSettings *s);
+    void toSettings(const Utils::Key &category, Utils::QtcSettings *s) const;
+    void fromSettings(const Utils::Key &category, Utils::QtcSettings *s);
 
     void setDefinitionFilesPath(const Utils::FilePath &path) { m_definitionFilesPath = path; }
     const Utils::FilePath &definitionFilesPath() const { return m_definitionFilesPath; }
diff --git a/src/plugins/texteditor/highlightersettingspage.cpp b/src/plugins/texteditor/highlightersettingspage.cpp
index 856a181009..8b704a7157 100644
--- a/src/plugins/texteditor/highlightersettingspage.cpp
+++ b/src/plugins/texteditor/highlightersettingspage.cpp
@@ -51,7 +51,7 @@ public:
     }
 
     bool m_initialized = false;
-    const QString m_settingsPrefix{"Text"};
+    const Key m_settingsPrefix{"Text"};
 
     HighlighterSettings m_settings;
 
diff --git a/src/plugins/texteditor/marginsettings.cpp b/src/plugins/texteditor/marginsettings.cpp
index de564ba848..f47e326c92 100644
--- a/src/plugins/texteditor/marginsettings.cpp
+++ b/src/plugins/texteditor/marginsettings.cpp
@@ -5,16 +5,18 @@
 
 #include <QSettings>
 
-static const char showWrapColumnKey[] = "ShowMargin";
-static const char wrapColumnKey[] = "MarginColumn";
-static const char groupPostfix[] = "textMarginSettings";
-static const char useIndenterColumnKey[] = "UseIndenter";
-static const char tintMarginAreaColumnKey[] = "tintMarginArea";
+#include <utils/qtcsettings.h>
 
 using namespace Utils;
 
 namespace TextEditor {
 
+const char showWrapColumnKey[] = "ShowMargin";
+const char wrapColumnKey[] = "MarginColumn";
+const char groupPostfix[] = "textMarginSettings";
+const char useIndenterColumnKey[] = "UseIndenter";
+const char tintMarginAreaColumnKey[] = "tintMarginArea";
+
 MarginSettings::MarginSettings()
     : m_showMargin(false)
     , m_tintMarginArea(true)
@@ -23,25 +25,25 @@ MarginSettings::MarginSettings()
 {
 }
 
-void MarginSettings::toSettings(QSettings *s) const
+void MarginSettings::toSettings(QtcSettings *s) const
 {
     s->beginGroup(groupPostfix);
-    s->setValue(QLatin1String(showWrapColumnKey), m_showMargin);
-    s->setValue(QLatin1String(tintMarginAreaColumnKey), m_tintMarginArea);
-    s->setValue(QLatin1String(useIndenterColumnKey), m_useIndenter);
-    s->setValue(QLatin1String(wrapColumnKey), m_marginColumn);
+    s->setValue(showWrapColumnKey, m_showMargin);
+    s->setValue(tintMarginAreaColumnKey, m_tintMarginArea);
+    s->setValue(useIndenterColumnKey, m_useIndenter);
+    s->setValue(wrapColumnKey, m_marginColumn);
     s->endGroup();
 }
 
-void MarginSettings::fromSettings(QSettings *s)
+void MarginSettings::fromSettings(QtcSettings *s)
 {
     s->beginGroup(groupPostfix);
     *this = MarginSettings(); // Assign defaults
 
-    m_showMargin = s->value(QLatin1String(showWrapColumnKey), m_showMargin).toBool();
-    m_tintMarginArea = s->value(QLatin1String(tintMarginAreaColumnKey), m_tintMarginArea).toBool();
-    m_useIndenter = s->value(QLatin1String(useIndenterColumnKey), m_useIndenter).toBool();
-    m_marginColumn = s->value(QLatin1String(wrapColumnKey), m_marginColumn).toInt();
+    m_showMargin = s->value(showWrapColumnKey, m_showMargin).toBool();
+    m_tintMarginArea = s->value(tintMarginAreaColumnKey, m_tintMarginArea).toBool();
+    m_useIndenter = s->value(useIndenterColumnKey, m_useIndenter).toBool();
+    m_marginColumn = s->value(wrapColumnKey, m_marginColumn).toInt();
     s->endGroup();
 }
 
diff --git a/src/plugins/texteditor/marginsettings.h b/src/plugins/texteditor/marginsettings.h
index cf5c1c0aaa..903e1c6d00 100644
--- a/src/plugins/texteditor/marginsettings.h
+++ b/src/plugins/texteditor/marginsettings.h
@@ -7,10 +7,6 @@
 
 #include <utils/store.h>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
-
 namespace TextEditor {
 
 class TEXTEDITOR_EXPORT MarginSettings
@@ -18,8 +14,8 @@ class TEXTEDITOR_EXPORT MarginSettings
 public:
     MarginSettings();
 
-    void toSettings(QSettings *s) const;
-    void fromSettings(QSettings *s);
+    void toSettings(Utils::QtcSettings *s) const;
+    void fromSettings(Utils::QtcSettings *s);
 
     Utils::Store toMap() const;
     void fromMap(const Utils::Store &map);
diff --git a/src/plugins/texteditor/markdowneditor.cpp b/src/plugins/texteditor/markdowneditor.cpp
index 6a168294ae..43face2977 100644
--- a/src/plugins/texteditor/markdowneditor.cpp
+++ b/src/plugins/texteditor/markdowneditor.cpp
@@ -12,6 +12,9 @@
 #include <coreplugin/coreplugintr.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/minisplitter.h>
+
+#include <utils/qtcsettings.h>
+#include <utils/qtcsettings.h>
 #include <utils/stringutils.h>
 #include <utils/utilsicons.h>
 
@@ -23,6 +26,8 @@
 
 #include <optional>
 
+using namespace Utils;
+
 namespace TextEditor::Internal {
 
 const char MARKDOWNVIEWER_ID[] = "Editors.MarkdownViewer";
@@ -43,7 +48,7 @@ public:
     {
         m_document->setMimeType(MARKDOWNVIEWER_MIME_TYPE);
 
-        QSettings *s = Core::ICore::settings();
+        QtcSettings *s = Core::ICore::settings();
         const bool textEditorRight
             = s->value(MARKDOWNVIEWER_TEXTEDITOR_RIGHT, kTextEditorRightDefault).toBool();
         const bool showPreview = s->value(MARKDOWNVIEWER_SHOW_PREVIEW, kShowPreviewDefault).toBool();
diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp
index 2b2cc5e73a..2c46212702 100644
--- a/src/plugins/texteditor/outlinefactory.cpp
+++ b/src/plugins/texteditor/outlinefactory.cpp
@@ -13,6 +13,7 @@
 
 #include <utils/utilsicons.h>
 #include <utils/qtcassert.h>
+#include <utils/store.h>
 #include <utils/stylehelper.h>
 
 #include <QDebug>
@@ -21,6 +22,8 @@
 #include <QStackedWidget>
 #include <QToolButton>
 
+using namespace Utils;
+
 namespace TextEditor {
 
 static QList<IOutlineWidgetFactory *> g_outlineWidgetFactories;
@@ -54,8 +57,8 @@ public:
 
     QList<QToolButton *> toolButtons();
 
-    void saveSettings(QSettings *settings, int position);
-    void restoreSettings(QSettings *settings, int position);
+    void saveSettings(Utils::QtcSettings *settings, int position);
+    void restoreSettings(Utils::QtcSettings *settings, int position);
 
 private:
     bool isCursorSynchronized() const;
@@ -131,32 +134,33 @@ QList<QToolButton *> OutlineWidgetStack::toolButtons()
 
 OutlineWidgetStack::~OutlineWidgetStack() = default;
 
-void OutlineWidgetStack::saveSettings(QSettings *settings, int position)
+void OutlineWidgetStack::saveSettings(QtcSettings *settings, int position)
 {
-    const QString baseKey = QStringLiteral("Outline.%1.").arg(position);
-    settings->setValue(baseKey + QLatin1String("SyncWithEditor"), m_toggleSync->isChecked());
+    const Key baseKey = numberedKey("Outline.", position) + '.';
+    settings->setValue(baseKey + "SyncWithEditor", m_toggleSync->isChecked());
     for (auto iter = m_widgetSettings.constBegin(); iter != m_widgetSettings.constEnd(); ++iter)
-        settings->setValue(baseKey + iter.key(), iter.value());
+        settings->setValue(baseKey + keyFromString(iter.key()), iter.value());
 }
 
-void OutlineWidgetStack::restoreSettings(QSettings *settings, int position)
+void OutlineWidgetStack::restoreSettings(Utils::QtcSettings *settings, int position)
 {
-    const QString baseKey = QStringLiteral("Outline.%1.").arg(position);
+    const Key baseKey = numberedKey("Outline.", position) + '.';
+    const QString baseKeyString = stringFromKey(baseKey);
 
     bool syncWithEditor = true;
     m_widgetSettings.clear();
     const QStringList longKeys = settings->allKeys();
     for (const QString &longKey : longKeys) {
-        if (!longKey.startsWith(baseKey))
+        if (!longKey.startsWith(baseKeyString))
             continue;
 
-        const QString key = longKey.mid(baseKey.length());
+        const QString key = longKey.mid(baseKeyString.length());
 
         if (key == QLatin1String("SyncWithEditor")) {
-            syncWithEditor = settings->value(longKey).toBool();
+            syncWithEditor = settings->value(keyFromString(longKey)).toBool();
             continue;
         }
-        m_widgetSettings.insert(key, settings->value(longKey));
+        m_widgetSettings.insert(key, settings->value(keyFromString(longKey)));
     }
 
     m_toggleSync->setChecked(syncWithEditor);
diff --git a/src/plugins/texteditor/snippets/snippetssettings.cpp b/src/plugins/texteditor/snippets/snippetssettings.cpp
index c041343dad..cce25bc710 100644
--- a/src/plugins/texteditor/snippets/snippetssettings.cpp
+++ b/src/plugins/texteditor/snippets/snippetssettings.cpp
@@ -2,31 +2,27 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "snippetssettings.h"
-#include "reuse.h"
 
-#include <QSettings>
+#include <utils/qtcsettings.h>
 
-namespace {
+using namespace Utils;
 
-static const QLatin1String kGroupPostfix("SnippetsSettings");
-static const QLatin1String kLastUsedSnippetGroup("LastUsedSnippetGroup");
+namespace TextEditor {
 
-} // Anonymous
+const char kGroupPostfix[] = "SnippetsSettings";
+const char kLastUsedSnippetGroup[] = "LastUsedSnippetGroup";
 
-using namespace TextEditor;
-using namespace Internal;
-
-void SnippetsSettings::toSettings(const QString &category, QSettings *s) const
+void SnippetsSettings::toSettings(const Key &category, QtcSettings *s) const
 {
-    const QString &group = category + kGroupPostfix;
+    const Key group = category + kGroupPostfix;
     s->beginGroup(group);
     s->setValue(kLastUsedSnippetGroup, m_lastUsedSnippetGroup);
     s->endGroup();
 }
 
-void SnippetsSettings::fromSettings(const QString &category, QSettings *s)
+void SnippetsSettings::fromSettings(const Key &category, QtcSettings *s)
 {
-    const QString &group = category + kGroupPostfix;
+    const Key group = category + kGroupPostfix;
     s->beginGroup(group);
     m_lastUsedSnippetGroup = s->value(kLastUsedSnippetGroup, QString()).toString();
     s->endGroup();
@@ -46,3 +42,5 @@ bool SnippetsSettings::equals(const SnippetsSettings &snippetsSettings) const
 {
     return m_lastUsedSnippetGroup == snippetsSettings.m_lastUsedSnippetGroup;
 }
+
+} // TextEditor
diff --git a/src/plugins/texteditor/snippets/snippetssettings.h b/src/plugins/texteditor/snippets/snippetssettings.h
index af74fd960a..732d51f671 100644
--- a/src/plugins/texteditor/snippets/snippetssettings.h
+++ b/src/plugins/texteditor/snippets/snippetssettings.h
@@ -5,9 +5,10 @@
 
 #include <QString>
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+namespace Utils {
+class Key;
+class QtcSettings;
+} // Utils
 
 namespace TextEditor {
 
@@ -16,8 +17,8 @@ class SnippetsSettings
 public:
     SnippetsSettings() = default;
 
-    void toSettings(const QString &category, QSettings *s) const;
-    void fromSettings(const QString &category, QSettings *s);
+    void toSettings(const Utils::Key &category, Utils::QtcSettings *s) const;
+    void fromSettings(const Utils::Key &category, Utils::QtcSettings *s);
 
     void setLastUsedSnippetGroup(const QString &lastUsed);
     const QString &lastUsedSnippetGroup() const;
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
index e4bfdf7df8..51deff5ad1 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
@@ -35,6 +35,8 @@
 #include <QStackedWidget>
 #include <QTextStream>
 
+using namespace Utils;
+
 namespace TextEditor::Internal {
 
 // SnippetsTableModel
@@ -273,7 +275,7 @@ private:
     bool settingsChanged() const;
     void writeSettings();
 
-    const QString m_settingsPrefix{QLatin1String("Text")};
+    const Key m_settingsPrefix{"Text"};
     SnippetsTableModel m_model;
     bool m_snippetsCollectionChanged = false;
     SnippetsSettings m_settings;
diff --git a/src/plugins/todo/settings.cpp b/src/plugins/todo/settings.cpp
index cf6c0003de..d5aafadd37 100644
--- a/src/plugins/todo/settings.cpp
+++ b/src/plugins/todo/settings.cpp
@@ -6,14 +6,16 @@
 #include "constants.h"
 
 #include <coreplugin/coreconstants.h>
+
+#include <utils/qtcsettings.h>
 #include <utils/theme/theme.h>
 
-#include <QSettings>
+using namespace Utils;
 
 namespace Todo {
 namespace Internal {
 
-void Settings::save(QSettings *settings) const
+void Settings::save(QtcSettings *settings) const
 {
     if (!keywordsEdited)
         return;
@@ -23,9 +25,9 @@ void Settings::save(QSettings *settings) const
 
     settings->beginWriteArray(Constants::KEYWORDS_LIST);
     if (const int size = keywords.size()) {
-        const QString nameKey = "name";
-        const QString colorKey = "color";
-        const QString iconTypeKey = "iconType";
+        const Key nameKey = "name";
+        const Key colorKey = "color";
+        const Key iconTypeKey = "iconType";
         for (int i = 0; i < size; ++i) {
             settings->setArrayIndex(i);
             settings->setValue(nameKey, keywords.at(i).name);
@@ -39,7 +41,7 @@ void Settings::save(QSettings *settings) const
     settings->sync();
 }
 
-void Settings::load(QSettings *settings)
+void Settings::load(QtcSettings *settings)
 {
     setDefault();
 
@@ -53,9 +55,9 @@ void Settings::load(QSettings *settings)
     KeywordList newKeywords;
     const int keywordsSize = settings->beginReadArray(Constants::KEYWORDS_LIST);
     if (keywordsSize > 0) {
-        const QString nameKey = "name";
-        const QString colorKey = "color";
-        const QString iconTypeKey = "iconType";
+        const Key nameKey = "name";
+        const Key colorKey = "color";
+        const Key iconTypeKey = "iconType";
         for (int i = 0; i < keywordsSize; ++i) {
             settings->setArrayIndex(i);
             Keyword keyword;
diff --git a/src/plugins/todo/settings.h b/src/plugins/todo/settings.h
index 57dc13990c..534b1a1b0c 100644
--- a/src/plugins/todo/settings.h
+++ b/src/plugins/todo/settings.h
@@ -6,9 +6,7 @@
 
 #include "keyword.h"
 
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+namespace Utils { class QtcSettings; }
 
 namespace Todo {
 namespace Internal {
@@ -20,14 +18,15 @@ enum ScanningScope {
     ScanningScopeMax
 };
 
-class Settings {
+class Settings
+{
 public:
     KeywordList keywords;
     ScanningScope scanningScope = ScanningScopeCurrentFile;
     bool keywordsEdited = false;
 
-    void save(QSettings *settings) const;
-    void load(QSettings *settings);
+    void save(Utils::QtcSettings *settings) const;
+    void load(Utils::QtcSettings *settings);
     void setDefault();
     bool equals(const Settings &other) const;
 };
diff --git a/src/plugins/todo/todooutputtreeview.cpp b/src/plugins/todo/todooutputtreeview.cpp
index 5f20d381de..a0519d59e9 100644
--- a/src/plugins/todo/todooutputtreeview.cpp
+++ b/src/plugins/todo/todooutputtreeview.cpp
@@ -7,9 +7,12 @@
 
 #include <coreplugin/icore.h>
 
+#include <utils/qtcsettings.h>
+
 #include <QResizeEvent>
 #include <QHeaderView>
-#include <QSettings>
+
+using namespace Utils;
 
 namespace Todo {
 namespace Internal {
@@ -38,7 +41,7 @@ TodoOutputTreeView::~TodoOutputTreeView()
 
 void TodoOutputTreeView::saveDisplaySettings()
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(Constants::SETTINGS_GROUP);
     settings->setValue(Constants::OUTPUT_PANE_TEXT_WIDTH,
                        columnWidth(Constants::OUTPUT_COLUMN_TEXT));
@@ -49,7 +52,7 @@ void TodoOutputTreeView::saveDisplaySettings()
 
 void TodoOutputTreeView::loadDisplaySettings()
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     settings->beginGroup(Constants::SETTINGS_GROUP);
     m_textColumnDefaultWidth = settings->value(Constants::OUTPUT_PANE_TEXT_WIDTH, 0).toInt();
     m_fileColumnDefaultWidth = settings->value(Constants::OUTPUT_PANE_FILE_WIDTH, 0).toInt();
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp
index ab13491525..1b631cb82c 100644
--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -338,8 +338,8 @@ bool UpdateInfoPlugin::initialize(const QStringList & /* arguments */, QString *
 void UpdateInfoPlugin::loadSettings() const
 {
     UpdateInfoPluginPrivate::Settings def;
-    QSettings *settings = ICore::settings();
-    const QString updaterKey = QLatin1String(UpdaterGroup) + '/';
+    QtcSettings *settings = ICore::settings();
+    const Key updaterKey = Key(UpdaterGroup) + '/';
     d->m_maintenanceTool = FilePath::fromSettings(settings->value(updaterKey + MaintenanceToolKey));
     d->m_lastCheckDate = settings->value(updaterKey + LastCheckDateKey, QDate()).toDate();
     d->m_settings.automaticCheck
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index 219fe800bc..fe488cc1af 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -281,7 +281,7 @@ CallgrindToolPrivate::CallgrindToolPrivate()
         cmd->setAttribute(Command::CA_NonConfigurable);
     }
 
-    QSettings *coreSettings = ICore::settings();
+    QtcSettings *coreSettings = ICore::settings();
 
     //
     // DockWidgets
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 6482f9ac5f..1cbd522571 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -800,7 +800,7 @@ void MemcheckToolPrivate::heobAction()
                        .arg(
                            "<a "
                            "href=\"https://github.com/ssbssa/dwarfstack/releases\">Dwarfstack</a>"),
-                   QString("HeobDwarfstackInfo"),
+                   Key("HeobDwarfstackInfo"),
                    QMessageBox::Ok | QMessageBox::Cancel,
                    QMessageBox::Ok)
                    != QMessageBox::Ok)
@@ -1187,7 +1187,7 @@ const char heobPathC[] = "Path";
 HeobDialog::HeobDialog(QWidget *parent) :
     QDialog(parent)
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     bool hasSelProfile = settings->contains(heobProfileC);
     const QString selProfile = hasSelProfile ? settings->value(heobProfileC).toString() : "Heob";
     m_profiles = settings->childGroups().filter(QRegularExpression("^Heob\\.Profile\\."));
@@ -1199,7 +1199,7 @@ HeobDialog::HeobDialog(QWidget *parent) :
     auto profilesLayout = new QHBoxLayout;
     m_profilesCombo = new QComboBox;
     for (const auto &profile : std::as_const(m_profiles))
-        m_profilesCombo->addItem(settings->value(profile + "/" + heobProfileNameC).toString());
+        m_profilesCombo->addItem(settings->value(keyFromString(profile) + "/" + heobProfileNameC).toString());
     if (hasSelProfile) {
         int selIdx = m_profiles.indexOf(selProfile);
         if (selIdx >= 0)
@@ -1402,8 +1402,9 @@ void HeobDialog::keyPressEvent(QKeyEvent *e)
 
 void HeobDialog::updateProfile()
 {
-    QSettings *settings = Core::ICore::settings();
-    const QString selProfile = m_profiles.empty() ? "heob" : m_profiles[m_profilesCombo->currentIndex()];
+    QtcSettings *settings = Core::ICore::settings();
+    const Key selProfile =
+        keyFromString(m_profiles.empty() ? "heob" : m_profiles[m_profilesCombo->currentIndex()]);
 
     settings->beginGroup(selProfile);
     const QString xml = settings->value(heobXmlC, "leaks.xml").toString();
@@ -1456,12 +1457,12 @@ void HeobDialog::updateEnabled()
 
 void HeobDialog::saveOptions()
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     const QString selProfile = m_profiles.at(m_profilesCombo->currentIndex());
 
     settings->setValue(heobProfileC, selProfile);
 
-    settings->beginGroup(selProfile);
+    settings->beginGroup(keyFromString(selProfile));
     settings->setValue(heobProfileNameC, m_profilesCombo->currentText());
     settings->setValue(heobXmlC, m_xmlEdit->text());
     settings->setValue(heobHandleExceptionC, m_handleExceptionCombo->currentIndex());
@@ -1528,11 +1529,11 @@ void HeobDialog::deleteProfileDialog()
 
 void HeobDialog::deleteProfile()
 {
-    QSettings *settings = Core::ICore::settings();
+    QtcSettings *settings = Core::ICore::settings();
     int index = m_profilesCombo->currentIndex();
     const QString profile = m_profiles.at(index);
     bool isDefault = settings->value(heobProfileC).toString() == profile;
-    settings->remove(profile);
+    settings->remove(keyFromString(profile));
     m_profiles.removeAt(index);
     m_profilesCombo->removeItem(index);
     if (isDefault)
diff --git a/src/plugins/welcome/introductionwidget.cpp b/src/plugins/welcome/introductionwidget.cpp
index ef56d9ab3e..d89805037a 100644
--- a/src/plugins/welcome/introductionwidget.cpp
+++ b/src/plugins/welcome/introductionwidget.cpp
@@ -29,7 +29,7 @@ namespace Internal {
 void IntroductionWidget::askUserAboutIntroduction(QWidget *parent)
 {
     // CheckableMessageBox for compatibility with Qt Creator < 4.11
-    if (!CheckableDecider(QString(kTakeTourSetting)).shouldAskAgain()
+    if (!CheckableDecider(Key(kTakeTourSetting)).shouldAskAgain()
         || !Core::ICore::infoBar()->canInfoBeAdded(kTakeTourSetting))
         return;
 
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 230dd27b93..342375c4e2 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -399,7 +399,7 @@ WelcomeMode::~WelcomeMode()
 
 void WelcomeMode::initPlugins()
 {
-    QSettings *settings = ICore::settings();
+    QtcSettings *settings = ICore::settings();
     m_activePage = Id::fromSetting(settings->value(currentPageSettingsKeyC));
 
     for (IWelcomePage *page : IWelcomePage::allWelcomePages())
author	hjk <hjk@qt.io>	2023-09-22 16:15:27 +0200
committer	hjk <hjk@qt.io>	2023-09-27 13:25:31 +0000
commit	342e066886ff4d472d9e07eb1f5702a548ac3e6e (patch)
tree	af6b09b98c68140e50d752f9da37f74d9736e722 /src/plugins
parent	4629b0f69ec4320b1ac6d8006b2f1957d5024683 (diff)