Plugins: And more Store and Key

After this one, is compiles with the opt-in macro. Not changed yet,
though.

Change-Id: I29a66ecb5daa71d0d97566b81fd9f47d92f6368a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

46 files changed, 246 insertions, 245 deletions

diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index d8e99a04f5..36ea8d42dc 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -57,7 +57,8 @@ namespace Android::Internal {
 
 static Q_LOGGING_CATEGORY(deployStepLog, "qtc.android.build.androiddeployqtstep", QtWarningMsg)
 
-const QLatin1String UninstallPreviousPackageKey("UninstallPreviousPackage");
+const char UninstallPreviousPackageKey[] = "UninstallPreviousPackage";
+
 const QLatin1String InstallFailedInconsistentCertificatesString("INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES");
 const QLatin1String InstallFailedUpdateIncompatible("INSTALL_FAILED_UPDATE_INCOMPATIBLE");
 const QLatin1String InstallFailedPermissionModelDowngrade("INSTALL_FAILED_PERMISSION_MODEL_DOWNGRADE");
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index 6be375f30f..b97cc7fac1 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -247,14 +247,14 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
     if (target->buildConfigurations().first()->buildType() != BuildConfiguration::BuildType::Release)
         m_extraAppParams = runControl->commandLine().arguments();
 
-    if (const QVariantMap sd = runControl->settingsData(Constants::ANDROID_AM_START_ARGS);
+    if (const Store sd = runControl->settingsData(Constants::ANDROID_AM_START_ARGS);
         !sd.values().isEmpty()) {
         QTC_CHECK(sd.first().type() == QVariant::String);
         const QString startArgs = sd.first().toString();
         m_amStartExtraArgs = ProcessArgs::splitArgs(startArgs, OsTypeOtherUnix);
     }
 
-    if (const QVariantMap sd = runControl->settingsData(Constants::ANDROID_PRESTARTSHELLCMDLIST);
+    if (const Store sd = runControl->settingsData(Constants::ANDROID_PRESTARTSHELLCMDLIST);
         !sd.values().isEmpty()) {
         QTC_CHECK(sd.first().type() == QVariant::String);
         const QStringList commands = sd.first().toString().split('\n', Qt::SkipEmptyParts);
@@ -262,7 +262,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
             m_beforeStartAdbCommands.append(QString("shell %1").arg(shellCmd));
     }
 
-    if (const QVariantMap sd = runControl->settingsData(Constants::ANDROID_POSTFINISHSHELLCMDLIST);
+    if (const Store sd = runControl->settingsData(Constants::ANDROID_POSTFINISHSHELLCMDLIST);
         !sd.values().isEmpty()) {
         QTC_CHECK(sd.first().type() == QVariant::String);
         const QStringList commands = sd.first().toString().split('\n', Qt::SkipEmptyParts);
diff --git a/src/plugins/android/javalanguageserver.cpp b/src/plugins/android/javalanguageserver.cpp
index 419edcabbd..d6ea811f00 100644
--- a/src/plugins/android/javalanguageserver.cpp
+++ b/src/plugins/android/javalanguageserver.cpp
@@ -136,9 +136,9 @@ bool JLSSettings::isValid() const
     return StdIOSettings::isValid() && !m_languageServer.isEmpty();
 }
 
-QVariantMap JLSSettings::toMap() const
+Store JLSSettings::toMap() const
 {
-    QVariantMap map = StdIOSettings::toMap();
+    Store map = StdIOSettings::toMap();
     map.insert(languageServerKey, m_languageServer.toSettings());
     return map;
 }
diff --git a/src/plugins/baremetal/debugserverprovidermanager.cpp b/src/plugins/baremetal/debugserverprovidermanager.cpp
index d56d81b2d9..849c7c1079 100644
--- a/src/plugins/baremetal/debugserverprovidermanager.cpp
+++ b/src/plugins/baremetal/debugserverprovidermanager.cpp
@@ -24,6 +24,8 @@
 #include <utils/persistentsettings.h>
 #include <utils/qtcassert.h>
 
+using namespace Utils;
+
 namespace BareMetal::Internal {
 
 const char dataKeyC[] = "DebugServerProvider.";
@@ -77,24 +79,24 @@ DebugServerProviderManager *DebugServerProviderManager::instance()
 
 void DebugServerProviderManager::restoreProviders()
 {
-    Utils::PersistentSettingsReader reader;
+    PersistentSettingsReader reader;
     if (!reader.load(m_configFile))
         return;
 
-    const QVariantMap data = reader.restoreValues();
+    const Store data = reader.restoreValues();
     const int version = data.value(fileVersionKeyC, 0).toInt();
     if (version < 1)
         return;
 
     const int count = data.value(countKeyC, 0).toInt();
     for (int i = 0; i < count; ++i) {
-        const QString key = QString::fromLatin1(dataKeyC) + QString::number(i);
+        const Key key = dataKeyC + Key::number(i);
         if (!data.contains(key))
             break;
 
-        QVariantMap map = data.value(key).toMap();
-        const QStringList keys = map.keys();
-        for (const QString &key : keys) {
+        Store map = data.value(key).value<Store>();
+        const KeyList keys = map.keys();
+        for (const Key &key : keys) {
             const int lastDot = key.lastIndexOf('.');
             if (lastDot != -1)
                 map[key.mid(lastDot + 1)] = map[key];
@@ -120,18 +122,18 @@ void DebugServerProviderManager::restoreProviders()
 
 void DebugServerProviderManager::saveProviders()
 {
-    QVariantMap data;
+    Store data;
     data.insert(fileVersionKeyC, 1);
 
     int count = 0;
     for (const IDebugServerProvider *p : std::as_const(m_providers)) {
         if (p->isValid()) {
-            QVariantMap tmp;
+            Store tmp;
             p->toMap(tmp);
             if (tmp.isEmpty())
                 continue;
-            const QString key = QString::fromLatin1(dataKeyC) + QString::number(count);
-            data.insert(key, tmp);
+            const Key key = dataKeyC + Key::number(count);
+            data.insert(key, QVariant::fromValue(tmp));
             ++count;
         }
     }
diff --git a/src/plugins/baremetal/debugserverproviderssettingspage.cpp b/src/plugins/baremetal/debugserverproviderssettingspage.cpp
index bcb108f0ee..5c7a1cda51 100644
--- a/src/plugins/baremetal/debugserverproviderssettingspage.cpp
+++ b/src/plugins/baremetal/debugserverproviderssettingspage.cpp
@@ -347,7 +347,7 @@ DebugServerProvidersSettingsWidget::DebugServerProvidersSettingsWidget()
             for (const auto f : DebugServerProviderManager::factories()) {
                 if (id.startsWith(f->id())) {
                     IDebugServerProvider *p = f->create();
-                    QVariantMap map;
+                    Store map;
                     old->toMap(map);
                     p->fromMap(map);
                     p->setDisplayName(Tr::tr("Clone of %1").arg(old->displayName()));
diff --git a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp
index 0163d7b0d4..c9a22f7273 100644
--- a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp
@@ -243,13 +243,13 @@ JLinkUvscServerProvider::JLinkUvscServerProvider()
 void JLinkUvscServerProvider::toMap(Store &data) const
 {
     UvscServerProvider::toMap(data);
-    data.insert(adapterOptionsKeyC, m_adapterOpts.toMap());
+    data.insert(adapterOptionsKeyC, QVariant::fromValue(m_adapterOpts.toMap()));
 }
 
 void JLinkUvscServerProvider::fromMap(const Store &data)
 {
     UvscServerProvider::fromMap(data);
-    m_adapterOpts.fromMap(data.value(adapterOptionsKeyC).toMap());
+    m_adapterOpts.fromMap(data.value(adapterOptionsKeyC).value<Store>());
 }
 
 bool JLinkUvscServerProvider::operator==(const IDebugServerProvider &other) const
diff --git a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp
index ecad895da2..3725b2fc6e 100644
--- a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp
@@ -209,7 +209,7 @@ void StLinkUvscServerProvider::toMap(Store &data) const
 void StLinkUvscServerProvider::fromMap(const Store &data)
 {
     UvscServerProvider::fromMap(data);
-    m_adapterOpts.fromMap(data.value(adapterOptionsKeyC).toMap());
+    m_adapterOpts.fromMap(data.value(adapterOptionsKeyC).value<Store>());
 }
 
 bool StLinkUvscServerProvider::operator==(const IDebugServerProvider &other) const
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
index ed054528ca..31ebb34fb9 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
@@ -151,8 +151,8 @@ void UvscServerProvider::toMap(Store &data) const
 {
     IDebugServerProvider::toMap(data);
     data.insert(toolsIniKeyC, m_toolsIniFile.toSettings());
-    data.insert(deviceSelectionKeyC, m_deviceSelection.toMap());
-    data.insert(driverSelectionKeyC, m_driverSelection.toMap());
+    data.insert(deviceSelectionKeyC, QVariant::fromValue(m_deviceSelection.toMap()));
+    data.insert(driverSelectionKeyC, QVariant::fromValue(m_driverSelection.toMap()));
 }
 
 bool UvscServerProvider::isValid() const
@@ -223,8 +223,8 @@ void UvscServerProvider::fromMap(const Store &data)
 {
     IDebugServerProvider::fromMap(data);
     m_toolsIniFile = FilePath::fromSettings(data.value(toolsIniKeyC));
-    m_deviceSelection.fromMap(data.value(deviceSelectionKeyC).toMap());
-    m_driverSelection.fromMap(data.value(driverSelectionKeyC).toMap());
+    m_deviceSelection.fromMap(data.value(deviceSelectionKeyC).value<Store>());
+    m_driverSelection.fromMap(data.value(driverSelectionKeyC).value<Store>());
 }
 
 FilePath UvscServerProvider::projectFilePath(DebuggerRunTool *runTool, QString &errorMessage) const
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp
index c7fa9ba1db..33d6f3c456 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp
@@ -52,9 +52,9 @@ constexpr char deviceAlgorithmIndexKeyC[] = "DeviceAlgorithmIndex";
 
 // DeviceSelection
 
-QVariantMap DeviceSelection::toMap() const
+Store DeviceSelection::toMap() const
 {
-    QVariantMap map;
+    Store map;
     // Software package.
     map.insert(packageDescrKeyC, package.desc);
     map.insert(packageFileKeyC, package.file);
@@ -79,23 +79,23 @@ QVariantMap DeviceSelection::toMap() const
     // Device MEMORY.
     QVariantList memoryList;
     for (const DeviceSelection::Memory &memory : std::as_const(memories)) {
-        QVariantMap m;
+        Store m;
         m.insert(deviceMemoryIdKeyC, memory.id);
         m.insert(deviceMemoryStartKeyC, memory.start);
         m.insert(deviceMemorySizeKeyC, memory.size);
-        memoryList.push_back(m);
+        memoryList.push_back(QVariant::fromValue(m));
     }
     map.insert(deviceMemoryKeyC, memoryList);
     // Device ALGORITHM.
     QVariantList algorithmList;
     for (const DeviceSelection::Algorithm &algorithm : std::as_const(algorithms)) {
-        QVariantMap m;
+        Store m;
         m.insert(deviceAlgorithmPathKeyC, algorithm.path);
         m.insert(deviceAlgorithmFlashStartKeyC, algorithm.flashStart);
         m.insert(deviceAlgorithmFlashSizeKeyC, algorithm.flashSize);
         m.insert(deviceAlgorithmRamStartKeyC, algorithm.ramStart);
         m.insert(deviceAlgorithmRamSizeKeyC, algorithm.ramSize);
-        algorithmList.push_back(m);
+        algorithmList.push_back(QVariant::fromValue(m));
     }
     map.insert(deviceAlgorithmKeyC, algorithmList);
     map.insert(deviceAlgorithmIndexKeyC, algorithmIndex);
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp
index b153d5d4ad..2abe09305c 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp
@@ -22,9 +22,9 @@ constexpr char driverNameKeyC[] = "DriverName";
 
 // DriverSelection
 
-QVariantMap DriverSelection::toMap() const
+Store DriverSelection::toMap() const
 {
-    QVariantMap map;
+    Store map;
     map.insert(driverIndexKeyC, index);
     map.insert(driverCpuDllIndexKeyC, cpuDllIndex);
     map.insert(driverDllKeyC, dll);
diff --git a/src/plugins/baremetal/idebugserverprovider.cpp b/src/plugins/baremetal/idebugserverprovider.cpp
index 966c961ef9..8725b5eb31 100644
--- a/src/plugins/baremetal/idebugserverprovider.cpp
+++ b/src/plugins/baremetal/idebugserverprovider.cpp
@@ -206,14 +206,14 @@ IDebugServerProvider *IDebugServerProviderFactory::create() const
     return m_creator();
 }
 
-IDebugServerProvider *IDebugServerProviderFactory::restore(const QVariantMap &data) const
+IDebugServerProvider *IDebugServerProviderFactory::restore(const Store &data) const
 {
     IDebugServerProvider *p = m_creator();
     p->fromMap(data);
     return p;
 }
 
-bool IDebugServerProviderFactory::canRestore(const QVariantMap &data) const
+bool IDebugServerProviderFactory::canRestore(const Store &data) const
 {
     const QString id = idFromMap(data);
     return id.startsWith(m_id + ':');
@@ -229,12 +229,12 @@ void IDebugServerProviderFactory::setCreator(const std::function<IDebugServerPro
     m_creator = creator;
 }
 
-QString IDebugServerProviderFactory::idFromMap(const QVariantMap &data)
+QString IDebugServerProviderFactory::idFromMap(const Store &data)
 {
     return data.value(idKeyC).toString();
 }
 
-void IDebugServerProviderFactory::idToMap(QVariantMap &data, const QString &id)
+void IDebugServerProviderFactory::idToMap(Store &data, const QString &id)
 {
     data.insert(idKeyC, id);
 }
diff --git a/src/plugins/baremetal/idebugserverprovider.h b/src/plugins/baremetal/idebugserverprovider.h
index b06cdc5c2b..12b5fe7d10 100644
--- a/src/plugins/baremetal/idebugserverprovider.h
+++ b/src/plugins/baremetal/idebugserverprovider.h
@@ -110,12 +110,12 @@ public:
     QString displayName() const;
 
     IDebugServerProvider *create() const;
-    IDebugServerProvider *restore(const QVariantMap &data) const;
+    IDebugServerProvider *restore(const Utils::Store &data) const;
 
-    bool canRestore(const QVariantMap &data) const;
+    bool canRestore(const Utils::Store &data) const;
 
-    static QString idFromMap(const QVariantMap &data);
-    static void idToMap(QVariantMap &data, const QString &id);
+    static QString idFromMap(const Utils::Store &data);
+    static void idToMap(Utils::Store &data, const QString &id);
 
 protected:
     IDebugServerProviderFactory();
diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp
index ff397e2ea7..68546d046e 100644
--- a/src/plugins/boot2qt/qdbdevice.cpp
+++ b/src/plugins/boot2qt/qdbdevice.cpp
@@ -143,16 +143,16 @@ void QdbDevice::fromMap(const Store &map)
     setSerialNumber(map.value("Qdb.SerialNumber").toString());
 }
 
-QVariantMap QdbDevice::toMap() const
+Store QdbDevice::toMap() const
 {
-    QVariantMap map = ProjectExplorer::IDevice::toMap();
+    Store map = ProjectExplorer::IDevice::toMap();
     map.insert("Qdb.SerialNumber", serialNumber());
     return map;
 }
 
 void QdbDevice::setupDefaultNetworkSettings(const QString &host)
 {
-    setFreePorts(Utils::PortList::fromString("10000-10100"));
+    setFreePorts(PortList::fromString("10000-10100"));
 
     SshParameters parameters = sshParameters();
     parameters.setHost(host);
diff --git a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
index d6e198538f..f9cd3dd6d1 100644
--- a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
+++ b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
@@ -85,7 +85,7 @@ public:
             upperPort = qmlServerPort;
         }
         if (m_usePerf) {
-            QVariantMap settingsData = runControl()->settingsData("Analyzer.Perf.Settings");
+            Store settingsData = runControl()->settingsData("Analyzer.Perf.Settings");
             QVariant perfRecordArgs = settingsData.value("Analyzer.Perf.RecordArguments");
             QString args =  Utils::transform(perfRecordArgs.toStringList(), [](QString arg) {
                                     return arg.replace(',', ",,");
diff --git a/src/plugins/clangtools/clangtoolsprojectsettings.cpp b/src/plugins/clangtools/clangtoolsprojectsettings.cpp
index 67b49dff70..e135cd15de 100644
--- a/src/plugins/clangtools/clangtoolsprojectsettings.cpp
+++ b/src/plugins/clangtools/clangtoolsprojectsettings.cpp
@@ -115,7 +115,7 @@ static Store convertToMapFromVersionBefore410(ProjectExplorer::Project *p)
     for (const Key &key : keys)
         map.insert(key, p->namedSettings(key));
 
-    map.insert(SETTINGS_PREFIX + QString(diagnosticConfigIdKey),
+    map.insert(SETTINGS_PREFIX + Key(diagnosticConfigIdKey),
                p->namedSettings("ClangTools.DiagnosticConfig"));
 
     return map;
@@ -124,7 +124,7 @@ static Store convertToMapFromVersionBefore410(ProjectExplorer::Project *p)
 void ClangToolsProjectSettings::load()
 {
     // Load map
-    Store map = m_project->namedSettings(SETTINGS_KEY_MAIN).toMap();
+    Store map = m_project->namedSettings(SETTINGS_KEY_MAIN).value<Store>();
 
     bool write = false;
     if (map.isEmpty()) {
@@ -148,7 +148,7 @@ void ClangToolsProjectSettings::load()
 
     const QVariantList list = map.value(SETTINGS_KEY_SUPPRESSED_DIAGS).toList();
     for (const QVariant &v : list) {
-        const Store diag = v.toMap();
+        const Store diag = v.value<Store>();
         const QString fp = diag.value(SETTINGS_KEY_SUPPRESSED_DIAGS_FILEPATH).toString();
         if (fp.isEmpty())
             continue;
@@ -190,19 +190,19 @@ void ClangToolsProjectSettings::store()
         diagMap.insert(SETTINGS_KEY_SUPPRESSED_DIAGS_FILEPATH, diag.filePath.toString());
         diagMap.insert(SETTINGS_KEY_SUPPRESSED_DIAGS_MESSAGE, diag.description);
         diagMap.insert(SETTINGS_KEY_SUPPRESSED_DIAGS_UNIQIFIER, diag.uniquifier);
-        list << diagMap;
+        list << QVariant::fromValue(diagMap);
     }
     map.insert(SETTINGS_KEY_SUPPRESSED_DIAGS, list);
 
     m_runSettings.toMap(map, SETTINGS_PREFIX);
 
-    m_project->setNamedSettings(SETTINGS_KEY_MAIN, map);
+    m_project->setNamedSettings(SETTINGS_KEY_MAIN, QVariant::fromValue(map));
 }
 
 ClangToolsProjectSettings::ClangToolsProjectSettingsPtr
     ClangToolsProjectSettings::getSettings(ProjectExplorer::Project *project)
 {
-    const QString key = "ClangToolsProjectSettings";
+    const Key key = "ClangToolsProjectSettings";
     QVariant v = project->extraData(key);
     if (v.isNull()) {
         v = QVariant::fromValue(
diff --git a/src/plugins/clangtools/clangtoolssettings.cpp b/src/plugins/clangtools/clangtoolssettings.cpp
index 31eb794957..4c000abd34 100644
--- a/src/plugins/clangtools/clangtoolssettings.cpp
+++ b/src/plugins/clangtools/clangtoolssettings.cpp
@@ -41,7 +41,7 @@ RunSettings::RunSettings()
 {
 }
 
-void RunSettings::fromMap(const Store &map, const QString &prefix)
+void RunSettings::fromMap(const Store &map, const Key &prefix)
 {
     m_diagnosticConfigId = Id::fromSetting(map.value(prefix + diagnosticConfigIdKey));
     m_parallelJobs = map.value(prefix + parallelJobsKey).toInt();
@@ -50,7 +50,7 @@ void RunSettings::fromMap(const Store &map, const QString &prefix)
     m_analyzeOpenFiles = map.value(prefix + analyzeOpenFilesKey).toBool();
 }
 
-void RunSettings::toMap(Store &map, const QString &prefix) const
+void RunSettings::toMap(Store &map, const Key &prefix) const
 {
     map.insert(prefix + diagnosticConfigIdKey, m_diagnosticConfigId.toSetting());
     map.insert(prefix + parallelJobsKey, m_parallelJobs);
@@ -104,12 +104,12 @@ ClangToolsSettings::ClangToolsSettings()
     readSettings();
 }
 
-static QVariantMap convertToMapFromVersionBefore410(QSettings *s)
+static Store convertToMapFromVersionBefore410(QSettings *s)
 {
     const char oldParallelJobsKey[] = "simultaneousProcesses";
     const char oldBuildBeforeAnalysisKey[] = "buildBeforeAnalysis";
 
-    QVariantMap map;
+    Store map;
     map.insert(diagnosticConfigIdKey, s->value(oldDiagnosticConfigIdKey));
     map.insert(parallelJobsKey, s->value(oldParallelJobsKey));
     map.insert(buildBeforeAnalysisKey, s->value(oldBuildBeforeAnalysisKey));
@@ -151,19 +151,19 @@ void ClangToolsSettings::readSettings()
     s->beginGroup(Constants::SETTINGS_ID);
     m_diagnosticConfigs.append(diagnosticConfigsFromSettings(s));
 
-    QVariantMap map;
+    Store map;
     if (!s->value(oldDiagnosticConfigIdKey).isNull()) {
         map = convertToMapFromVersionBefore410(s);
         write = true;
     } else {
-        QVariantMap defaults;
+        Store defaults;
         defaults.insert(diagnosticConfigIdKey, defaultDiagnosticId().toSetting());
         defaults.insert(parallelJobsKey, m_runSettings.parallelJobs());
         defaults.insert(preferConfigFileKey, m_runSettings.preferConfigFile());
         defaults.insert(buildBeforeAnalysisKey, m_runSettings.buildBeforeAnalysis());
         defaults.insert(analyzeOpenFilesKey, m_runSettings.analyzeOpenFiles());
         map = defaults;
-        for (QVariantMap::ConstIterator it = defaults.constBegin(); it != defaults.constEnd(); ++it)
+        for (Store::ConstIterator it = defaults.constBegin(); it != defaults.constEnd(); ++it)
             map.insert(it.key(), s->value(it.key(), it.value()));
     }
 
@@ -185,9 +185,9 @@ void ClangToolsSettings::writeSettings() const
 
     diagnosticConfigsToSettings(s, m_diagnosticConfigs);
 
-    QVariantMap map;
+    Store map;
     m_runSettings.toMap(map);
-    for (QVariantMap::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it)
+    for (Store::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it)
         s->setValue(it.key(), it.value());
 
     s->endGroup();
diff --git a/src/plugins/clangtools/clangtoolssettings.h b/src/plugins/clangtools/clangtoolssettings.h
index a49f021ae5..1c8656981d 100644
--- a/src/plugins/clangtools/clangtoolssettings.h
+++ b/src/plugins/clangtools/clangtoolssettings.h
@@ -26,8 +26,8 @@ class RunSettings
 public:
     RunSettings();
 
-    void fromMap(const Utils::Store &map, const QString &prefix = QString());
-    void toMap(Utils::Store &map, const QString &prefix = QString()) const;
+    void fromMap(const Utils::Store &map, const Utils::Key &prefix = {});
+    void toMap(Utils::Store &map, const Utils::Key &prefix = {}) const;
 
     Utils::Id diagnosticConfigId() const;
     void setDiagnosticConfigId(const Utils::Id &id) { m_diagnosticConfigId = id; }
diff --git a/src/plugins/clangtools/settingswidget.cpp b/src/plugins/clangtools/settingswidget.cpp
index 80aad561b0..113373f57e 100644
--- a/src/plugins/clangtools/settingswidget.cpp
+++ b/src/plugins/clangtools/settingswidget.cpp
@@ -49,8 +49,8 @@ SettingsWidget::SettingsWidget()
         pathChooser->setDefaultValue(placeHolderText);
         pathChooser->setFilePath(path);
         pathChooser->setHistoryCompleter(tool == ClangToolType::Tidy
-                                        ? QString("ClangTools.ClangTidyExecutable.History")
-                                        : QString("ClangTools.ClazyStandaloneExecutable.History"));
+                                        ? Key("ClangTools.ClangTidyExecutable.History")
+                                        : Key("ClangTools.ClazyStandaloneExecutable.History"));
         pathChooser->setCommandVersionArguments({"--version"});
         return pathChooser;
     };
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 75a4b44073..bec14ece1b 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -1942,7 +1942,7 @@ BuildInfo CMakeBuildConfigurationFactory::createBuildInfo(BuildType buildType)
         Store extraInfo;
         // enable QML debugging by default
         extraInfo.insert(Constants::QML_DEBUG_SETTING, TriState::Enabled.toVariant());
-        info.extraInfo = extraInfo;
+        info.extraInfo = QVariant::fromValue(extraInfo);
         break;
     }
     case BuildTypeRelease:
@@ -1969,7 +1969,7 @@ BuildInfo CMakeBuildConfigurationFactory::createBuildInfo(BuildType buildType)
         extraInfo.insert(CMAKE_BUILD_TYPE, "RelWithDebInfo");
         // enable QML debugging by default
         extraInfo.insert(Constants::QML_DEBUG_SETTING, TriState::Enabled.toVariant());
-        info.extraInfo = extraInfo;
+        info.extraInfo = QVariant::fromValue(extraInfo);
         break;
     }
     default:
diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp
index 43ba1b5721..4499be9417 100644
--- a/src/plugins/ios/iosdevice.cpp
+++ b/src/plugins/ios/iosdevice.cpp
@@ -131,18 +131,18 @@ void IosDevice::fromMap(const Store &map)
     IDevice::fromMap(map);
 
     m_extraInfo.clear();
-    const QVariantMap vMap = map.value(QLatin1String(Constants::EXTRA_INFO_KEY)).toMap();
+    const Store vMap = map.value(Constants::EXTRA_INFO_KEY).value<Store>();
     for (auto i = vMap.cbegin(), end = vMap.cend(); i != end; ++i)
-        m_extraInfo.insert(i.key(), i.value().toString());
+        m_extraInfo.insert(stringFromKey(i.key()), i.value().toString());
 }
 
-QVariantMap IosDevice::toMap() const
+Store IosDevice::toMap() const
 {
-    QVariantMap res = IDevice::toMap();
-    QVariantMap vMap;
+    Store res = IDevice::toMap();
+    Store vMap;
     for (auto i = m_extraInfo.cbegin(), end = m_extraInfo.cend(); i != end; ++i)
-        vMap.insert(i.key(), i.value());
-    res.insert(QLatin1String(Constants::EXTRA_INFO_KEY), vMap);
+        vMap.insert(keyFromString(i.key()), i.value());
+    res.insert(Constants::EXTRA_INFO_KEY, QVariant::fromValue(vMap));
     return res;
 }
 
@@ -153,7 +153,7 @@ QString IosDevice::deviceName() const
 
 QString IosDevice::uniqueDeviceID() const
 {
-    return id().suffixAfter(Utils::Id(Constants::IOS_DEVICE_ID));
+    return id().suffixAfter(Id(Constants::IOS_DEVICE_ID));
 }
 
 QString IosDevice::uniqueInternalDeviceId() const
@@ -543,9 +543,9 @@ IosDeviceFactory::IosDeviceFactory()
     setConstructionFunction([] { return IDevice::Ptr(new IosDevice); });
 }
 
-bool IosDeviceFactory::canRestore(const QVariantMap &map) const
+bool IosDeviceFactory::canRestore(const Store &map) const
 {
-    QVariantMap vMap = map.value(QLatin1String(Constants::EXTRA_INFO_KEY)).toMap();
+    Store vMap = map.value(Constants::EXTRA_INFO_KEY).value<Store>();
     if (vMap.isEmpty() || vMap.value(kDeviceName).toString() == QLatin1String("*unknown*"))
         return false; // transient device (probably generated during an activation)
     return true;
diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h
index 29d8fc24e4..24bee023de 100644
--- a/src/plugins/ios/iosdevice.h
+++ b/src/plugins/ios/iosdevice.h
@@ -8,10 +8,6 @@
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/devicesupport/idevicefactory.h>
 
-#include <QVariantMap>
-#include <QMap>
-#include <QString>
-#include <QStringList>
 #include <QTimer>
 
 namespace Ios {
@@ -61,7 +57,7 @@ class IosDeviceFactory final : public ProjectExplorer::IDeviceFactory
 public:
     IosDeviceFactory();
 
-    bool canRestore(const QVariantMap &map) const override;
+    bool canRestore(const Utils::Store &map) const override;
 };
 
 class IosDeviceManager : public QObject
diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp
index 960658d5d2..44a01a7522 100644
--- a/src/plugins/ios/iosdsymbuildstep.cpp
+++ b/src/plugins/ios/iosdsymbuildstep.cpp
@@ -87,22 +87,24 @@ void IosDsymBuildStep::toMap(Store &map) const
 {
     AbstractProcessStep::toMap(map);
 
-    map.insert(id().withSuffix(ARGUMENTS_PARTIAL_KEY).toString(),
+    // FIXME: Clean up after QVariantMap -> Utils::Store transition
+    // This is  map.insert(id().name() + ARGUMENTS_PARTIAL_KEY), arguments())
+    map.insert(keyFromString(id().withSuffix(ARGUMENTS_PARTIAL_KEY).toString()),
                arguments());
-    map.insert(id().withSuffix(USE_DEFAULT_ARGS_PARTIAL_KEY).toString(),
+    map.insert(keyFromString(id().withSuffix(USE_DEFAULT_ARGS_PARTIAL_KEY).toString()),
                isDefault());
-    map.insert(id().withSuffix(CLEAN_PARTIAL_KEY).toString(), m_clean);
-    map.insert(id().withSuffix(COMMAND_PARTIAL_KEY).toString(), command().toSettings());
+    map.insert(keyFromString(id().withSuffix(CLEAN_PARTIAL_KEY).toString()), m_clean);
+    map.insert(keyFromString(id().withSuffix(COMMAND_PARTIAL_KEY).toString()), command().toSettings());
 }
 
 void IosDsymBuildStep::fromMap(const Store &map)
 {
-    QVariant bArgs = map.value(id().withSuffix(ARGUMENTS_PARTIAL_KEY).toString());
+    QVariant bArgs = map.value(keyFromString(id().withSuffix(ARGUMENTS_PARTIAL_KEY).toString()));
     m_arguments = bArgs.toStringList();
     bool useDefaultArguments = map.value(
-                id().withSuffix(USE_DEFAULT_ARGS_PARTIAL_KEY).toString()).toBool();
-    m_clean = map.value(id().withSuffix(CLEAN_PARTIAL_KEY).toString(), m_clean).toBool();
-    m_command = FilePath::fromSettings(map.value(id().withSuffix(COMMAND_PARTIAL_KEY).toString()));
+                keyFromString(id().withSuffix(USE_DEFAULT_ARGS_PARTIAL_KEY).toString())).toBool();
+    m_clean = map.value(keyFromString(id().withSuffix(CLEAN_PARTIAL_KEY).toString()), m_clean).toBool();
+    m_command = FilePath::fromSettings(map.value(keyFromString(id().withSuffix(COMMAND_PARTIAL_KEY).toString())));
     if (useDefaultArguments) {
         m_command = defaultCommand();
         m_arguments = defaultArguments();
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index b165bfbef9..772c6ab922 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -40,7 +40,7 @@ using namespace Utils;
 
 namespace Ios::Internal {
 
-const QLatin1String deviceTypeKey("Ios.device_type");
+const char deviceTypeKey[] = "Ios.device_type";
 
 static QString displayName(const SimulatorInfo &device)
 {
@@ -210,7 +210,7 @@ void IosDeviceTypeAspect::fromMap(const Store &map)
 {
     bool deviceTypeIsInt;
     map.value(deviceTypeKey).toInt(&deviceTypeIsInt);
-    if (deviceTypeIsInt || !m_deviceType.fromMap(map.value(deviceTypeKey).toMap()))
+    if (deviceTypeIsInt || !m_deviceType.fromMap(map.value(deviceTypeKey).value<Store>()))
         updateDeviceType();
 
     m_runConfiguration->update();
@@ -218,7 +218,7 @@ void IosDeviceTypeAspect::fromMap(const Store &map)
 
 void IosDeviceTypeAspect::toMap(Store &map) const
 {
-    map.insert(deviceTypeKey, deviceType().toMap());
+    map.insert(deviceTypeKey, QVariant::fromValue(deviceType().toMap()));
 }
 
 QString IosRunConfiguration::disabledReason() const
diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp
index ee16f73277..301d8d087e 100644
--- a/src/plugins/ios/iossimulator.cpp
+++ b/src/plugins/ios/iossimulator.cpp
@@ -17,11 +17,11 @@ using namespace Utils;
 
 namespace Ios::Internal {
 
-const QLatin1String iosDeviceTypeDisplayNameKey("displayName");
-const QLatin1String iosDeviceTypeTypeKey("type");
-const QLatin1String iosDeviceTypeIdentifierKey("identifier");
+const char iosDeviceTypeDisplayNameKey[] = "displayName";
+const char iosDeviceTypeTypeKey[] = "type";
+const char iosDeviceTypeIdentifierKey[] = "identifier";
 
-IosSimulator::IosSimulator(Utils::Id id)
+IosSimulator::IosSimulator(Id id)
     : m_lastPort(Constants::IOS_SIMULATOR_PORT_START)
 {
     setupId(IDevice::AutoDetected, id);
@@ -83,9 +83,9 @@ bool IosDeviceType::fromMap(const Store &map)
             && (type != IosDeviceType::SimulatedDevice || !identifier.isEmpty());
 }
 
-QVariantMap IosDeviceType::toMap() const
+Store IosDeviceType::toMap() const
 {
-    QVariantMap res;
+    Store res;
     res[iosDeviceTypeDisplayNameKey] = displayName;
     res[iosDeviceTypeTypeKey]        = type;
     res[iosDeviceTypeIdentifierKey]  = identifier;
diff --git a/src/plugins/mcusupport/mcuabstractpackage.h b/src/plugins/mcusupport/mcuabstractpackage.h
index c319c32f03..c6131919e5 100644
--- a/src/plugins/mcusupport/mcuabstractpackage.h
+++ b/src/plugins/mcusupport/mcuabstractpackage.h
@@ -3,11 +3,11 @@
 
 #pragma once
 
+#include <utils/store.h>
+
 #include <QObject>
 
-namespace Utils {
-class FilePath;
-} // namespace Utils
+namespace Utils { class FilePath; }
 
 namespace McuSupport::Internal {
 
@@ -39,7 +39,7 @@ public:
     virtual void setPath(const Utils::FilePath &) = 0;
     virtual Utils::FilePath defaultPath() const = 0;
     virtual Utils::FilePath detectionPath() const = 0;
-    virtual QString settingsKey() const = 0;
+    virtual Utils::Key settingsKey() const = 0;
 
     virtual void updateStatus() = 0;
     virtual Status status() const = 0;
@@ -56,6 +56,6 @@ signals:
     void changed();
     void statusChanged();
     void reset();
+};
 
-}; // class McuAbstractPackage
 } // namespace McuSupport::Internal
diff --git a/src/plugins/mcusupport/mcupackage.cpp b/src/plugins/mcusupport/mcupackage.cpp
index 1c079eebdf..84c9d7d2d5 100644
--- a/src/plugins/mcusupport/mcupackage.cpp
+++ b/src/plugins/mcusupport/mcupackage.cpp
@@ -33,7 +33,7 @@ McuPackage::McuPackage(const SettingsHandler::Ptr &settingsHandler,
                        const QString &label,
                        const FilePath &defaultPath,
                        const FilePath &detectionPath,
-                       const QString &settingsKey,
+                       const Key &settingsKey,
                        const QString &cmakeVarName,
                        const QString &envVarName,
                        const QStringList &versions,
@@ -65,7 +65,7 @@ QString McuPackage::label() const
     return m_label;
 }
 
-QString McuPackage::settingsKey() const
+Key McuPackage::settingsKey() const
 {
     return m_settingsKey;
 }
@@ -334,7 +334,7 @@ McuToolChainPackage::McuToolChainPackage(const SettingsHandler::Ptr &settingsHan
                                          const QString &label,
                                          const FilePath &defaultPath,
                                          const FilePath &detectionPath,
-                                         const QString &settingsKey,
+                                         const Key &settingsKey,
                                          McuToolChainPackage::ToolChainType type,
                                          const QStringList &versions,
                                          const QString &cmakeVarName,
diff --git a/src/plugins/mcusupport/mcupackage.h b/src/plugins/mcusupport/mcupackage.h
index df0f80ba65..7008b2c499 100644
--- a/src/plugins/mcusupport/mcupackage.h
+++ b/src/plugins/mcusupport/mcupackage.h
@@ -28,12 +28,11 @@ class McuPackage : public McuAbstractPackage
     Q_OBJECT
 
 public:
-    McuPackage(
-        const SettingsHandler::Ptr &settingsHandler,
+    McuPackage(const SettingsHandler::Ptr &settingsHandler,
         const QString &label,
         const Utils::FilePath &defaultPath,
         const Utils::FilePath &detectionPath,
-        const QString &settingsKey,
+        const Utils::Key &settingsKey,
         const QString &cmakeVarName,
         const QString &envVarName,
         const QStringList &versions = {},
@@ -56,7 +55,7 @@ public:
     Utils::FilePath path() const override;
     Utils::FilePath defaultPath() const override;
     Utils::FilePath detectionPath() const override;
-    QString settingsKey() const final;
+    Utils::Key settingsKey() const final;
 
     void updateStatus() override;
     Status status() const override;
@@ -83,7 +82,7 @@ private:
     const QString m_label;
     Utils::FilePath m_defaultPath;
     const Utils::FilePath m_detectionPath;
-    const QString m_settingsKey;
+    const Utils::Key m_settingsKey;
     QScopedPointer<const McuPackageVersionDetector> m_versionDetector;
 
     Utils::FilePath m_path;
@@ -108,7 +107,7 @@ public:
                         const QString &label,
                         const Utils::FilePath &defaultPath,
                         const Utils::FilePath &detectionPath,
-                        const QString &settingsKey,
+                        const Utils::Key &settingsKey,
                         ToolChainType toolchainType,
                         const QStringList &versions,
                         const QString &cmakeVarName,
diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp
index d29aea4a54..a3eb731ea2 100644
--- a/src/plugins/mcusupport/mcusupportsdk.cpp
+++ b/src/plugins/mcusupport/mcusupportsdk.cpp
@@ -120,7 +120,7 @@ McuPackagePtr createBoardSdkPackage(const SettingsHandler::Ptr &settingsHandler,
                                         sdkName,
                                         defaultPath,
                                         {},                             // detection path
-                                        desc.boardSdk.envVar,           // settings key
+                                        keyFromString(desc.boardSdk.envVar), // settings key
                                         Constants::BOARD_SDK_CMAKE_VAR, // cmake var
                                         desc.boardSdk.envVar,           // env var
                                         desc.boardSdk.versions,
@@ -145,7 +145,7 @@ McuPackagePtr createFreeRTOSSourcesPackage(const SettingsHandler::Ptr &settingsH
                        QString::fromLatin1("FreeRTOS Sources (%1)").arg(envVarPrefix),
                        defaultPath,
                        "tasks.c", // detection path
-                       QString{Constants::SETTINGS_KEY_FREERTOS_PREFIX}.append(envVarPrefix),
+                       Constants::SETTINGS_KEY_FREERTOS_PREFIX + keyFromString(envVarPrefix),
                        "FREERTOS_DIR",           // cmake var
                        envVar,                   // env var
                        {},                       // versions
@@ -687,7 +687,7 @@ static PackageDescription parsePackage(const QJsonObject &cmakeEntry)
             cmakeEntry["envVar"].toString(),
             cmakeEntry["cmakeVar"].toString(),
             cmakeEntry["description"].toString(),
-            cmakeEntry["setting"].toString(),
+            keyFromString(cmakeEntry["setting"].toString()),
             FilePath::fromUserInput(defaultPathString),
             FilePath::fromUserInput(detectionPathString),
             versions,
diff --git a/src/plugins/mcusupport/mcutargetdescription.h b/src/plugins/mcusupport/mcutargetdescription.h
index ebf7e8c7ef..e495b26192 100644
--- a/src/plugins/mcusupport/mcutargetdescription.h
+++ b/src/plugins/mcusupport/mcutargetdescription.h
@@ -28,7 +28,7 @@ struct PackageDescription
     QString envVar;
     QString cmakeVar;
     QString description;
-    QString setting;
+    Utils::Key setting;
     Utils::FilePath defaultPath;
     Utils::FilePath detectionPath;
     QStringList versions;
diff --git a/src/plugins/mcusupport/settingshandler.cpp b/src/plugins/mcusupport/settingshandler.cpp
index 67fbd27f97..32bc9132d2 100644
--- a/src/plugins/mcusupport/settingshandler.cpp
+++ b/src/plugins/mcusupport/settingshandler.cpp
@@ -6,29 +6,28 @@
 #include "mcusupportconstants.h"
 
 #include <coreplugin/icore.h>
+
 #include <utils/filepath.h>
+#include <utils/store.h>
 
-namespace McuSupport::Internal {
+using namespace Utils;
 
-using Utils::FilePath;
+namespace McuSupport::Internal {
 
-namespace {
-const QString automaticKitCreationSettingsKey = QLatin1String(Constants::SETTINGS_GROUP) + '/'
-                                                + QLatin1String(
-                                                    Constants::SETTINGS_KEY_AUTOMATIC_KIT_CREATION);
-}
+const Key automaticKitCreationSettingsKey = Key(Constants::SETTINGS_GROUP) + '/'
+            + Constants::SETTINGS_KEY_AUTOMATIC_KIT_CREATION;
 
-static FilePath packagePathFromSettings(const QString &settingsKey,
+static FilePath packagePathFromSettings(const Key &settingsKey,
                                         QSettings &settings,
                                         const FilePath &defaultPath)
 {
-    const QString key = QLatin1String(Constants::SETTINGS_GROUP) + '/'
-                        + QLatin1String(Constants::SETTINGS_KEY_PACKAGE_PREFIX) + settingsKey;
+    const Key key = Key(Constants::SETTINGS_GROUP) + '/'
+        + Constants::SETTINGS_KEY_PACKAGE_PREFIX + settingsKey;
     const QString path = settings.value(key, defaultPath.toUserOutput()).toString();
     return FilePath::fromUserInput(path);
 }
 
-FilePath SettingsHandler::getPath(const QString &settingsKey,
+FilePath SettingsHandler::getPath(const Key &settingsKey,
                                   QSettings::Scope scope,
                                   const FilePath &defaultPath) const
 {
@@ -39,15 +38,14 @@ FilePath SettingsHandler::getPath(const QString &settingsKey,
     return packagePathFromSettings(settingsKey, *Core::ICore::settings(scope), defaultPath);
 }
 
-bool SettingsHandler::write(const QString &settingsKey,
+bool SettingsHandler::write(const Key &settingsKey,
                             const FilePath &path,
                             const FilePath &defaultPath) const
 {
     const FilePath savedPath = packagePathFromSettings(settingsKey,
                                                        *Core::ICore::settings(QSettings::UserScope),
                                                        defaultPath);
-    const QString key = QLatin1String(Constants::SETTINGS_GROUP) + '/'
-                        + QLatin1String(Constants::SETTINGS_KEY_PACKAGE_PREFIX) + settingsKey;
+    const Key key = Key(Constants::SETTINGS_GROUP) + '/' + Constants::SETTINGS_KEY_PACKAGE_PREFIX + settingsKey;
     Core::ICore::settings()->setValueWithDefault(key,
                                                  path.toUserOutput(),
                                                  defaultPath.toUserOutput());
diff --git a/src/plugins/mcusupport/settingshandler.h b/src/plugins/mcusupport/settingshandler.h
index 145049e31d..477f04da42 100644
--- a/src/plugins/mcusupport/settingshandler.h
+++ b/src/plugins/mcusupport/settingshandler.h
@@ -2,13 +2,12 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 #pragma once
 
+#include <utils/storekey.h>
+
 #include <QSettings>
 #include <QSharedPointer>
-#include <QString>
 
-namespace Utils {
-class FilePath;
-} //namespace Utils
+namespace Utils { class FilePath; }
 
 namespace McuSupport::Internal {
 
@@ -17,11 +16,11 @@ class SettingsHandler
 public:
     using Ptr = QSharedPointer<SettingsHandler>;
     virtual ~SettingsHandler() = default;
-    virtual Utils::FilePath getPath(const QString &settingsKey,
+    virtual Utils::FilePath getPath(const Utils::Key &settingsKey,
                                     QSettings::Scope scope,
                                     const Utils::FilePath &m_defaultPath) const;
 
-    virtual bool write(const QString &settingsKey,
+    virtual bool write(const Utils::Key &settingsKey,
                        const Utils::FilePath &path,
                        const Utils::FilePath &defaultPath) const;
 
@@ -29,6 +28,6 @@ public:
     void setAutomaticKitCreation(bool isEnabled);
     void setInitialPlatformName(const QString &platform);
     QString initialPlatformName() const;
+};
 
-}; //class SettingsHandler
 } // namespace McuSupport::Internal
diff --git a/src/plugins/mcusupport/test/packagemock.h b/src/plugins/mcusupport/test/packagemock.h
index 1e62fb7764..06d3be6230 100644
--- a/src/plugins/mcusupport/test/packagemock.h
+++ b/src/plugins/mcusupport/test/packagemock.h
@@ -6,7 +6,9 @@
 #include "mcuabstractpackage.h"
 
 #include <gmock/gmock.h>
+
 #include <utils/filepath.h>
+#include <utils/storekey.h>
 
 namespace McuSupport::Internal {
 
@@ -21,7 +23,7 @@ public:
     MOCK_METHOD(Utils::FilePath, detectionPath, (), (const));
     MOCK_METHOD(QString, statusText, (), (const));
     MOCK_METHOD(void, updateStatus, ());
-    MOCK_METHOD(QString, settingsKey, (), (const));
+    MOCK_METHOD(Utils::Key, settingsKey, (), (const));
 
     MOCK_METHOD(Status, status, (), (const));
     MOCK_METHOD(bool, isValidStatus, (), (const));
@@ -34,5 +36,6 @@ public:
 
     MOCK_METHOD(QWidget *, widget, ());
     MOCK_METHOD(const McuPackageVersionDetector *, getVersionDetector, (), (const));
-}; // class PackageMock
+};
+
 } // namespace McuSupport::Internal
diff --git a/src/plugins/mcusupport/test/settingshandlermock.h b/src/plugins/mcusupport/test/settingshandlermock.h
index cecf1415c2..1cb3faf473 100644
--- a/src/plugins/mcusupport/test/settingshandlermock.h
+++ b/src/plugins/mcusupport/test/settingshandlermock.h
@@ -5,7 +5,9 @@
 #include "settingshandler.h"
 
 #include <gmock/gmock.h>
+
 #include <utils/filepath.h>
+#include <utils/storekey.h>
 
 namespace McuSupport::Internal {
 
@@ -14,13 +16,15 @@ class SettingsHandlerMock : public SettingsHandler
 public:
     SettingsHandlerMock() = default;
     ~SettingsHandlerMock() override = default;
+
     MOCK_METHOD(Utils::FilePath,
                 getPath,
-                (const QString &, QSettings::Scope, const Utils::FilePath &),
+                (const Utils::Key &, QSettings::Scope, const Utils::FilePath &),
                 (const, override));
     MOCK_METHOD(bool,
                 write,
-                (const QString &, const Utils::FilePath &, const Utils::FilePath &),
+                (const Utils::Key &, const Utils::FilePath &, const Utils::FilePath &),
                 (const, override));
-}; //class SettingsHandler
+};
+
 } // namespace McuSupport::Internal
diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp
index 4ac73b992a..136a083288 100644
--- a/src/plugins/mcusupport/test/unittest.cpp
+++ b/src/plugins/mcusupport/test/unittest.cpp
@@ -293,7 +293,7 @@ void verifyTargetToolchains(const Targets &targets,
                             const QString &toolchainFilePath,
                             const QString &toolchainFileDefaultPath,
                             const QString &compilerPath,
-                            const QString &compilerSetting,
+                            const Key &compilerSetting,
                             const QStringList &versions)
 {
     QCOMPARE(targets.size(), 1);
@@ -322,7 +322,7 @@ void verifyBoardSdk(const McuPackagePtr &boardSdk,
     QVERIFY(boardSdk);
     QCOMPARE(boardSdk->cmakeVariableName(), cmakeVariable);
     QCOMPARE(boardSdk->environmentVariableName(), environmentVariable);
-    QCOMPARE(boardSdk->settingsKey(), environmentVariable);
+    QCOMPARE(boardSdk->settingsKey(), keyFromString(environmentVariable));
     QCOMPARE(boardSdk->detectionPath().toString(), empty);
     QCOMPARE(boardSdk->versions(), versions);
 }
@@ -332,7 +332,7 @@ void verifyFreeRtosPackage(const McuPackagePtr &freeRtos,
                            const FilePath &boardSdkDir,
                            const QString &freeRtosPath,
                            const QString &freeRtosDetectionPath,
-                           const QString &expectedSettingsKey)
+                           const Key &expectedSettingsKey)
 {
     QVERIFY(freeRtos);
     QCOMPARE(freeRtos->environmentVariableName(), envVar);
@@ -346,7 +346,7 @@ void verifyFreeRtosPackage(const McuPackagePtr &freeRtos,
 void verifyPackage(const McuPackagePtr &package,
                    const QString &path,
                    const QString &defaultPath,
-                   const QString &setting,
+                   const Key &setting,
                    const QString &cmakeVar,
                    const QString &envVar,
                    const QString &label,
@@ -468,7 +468,7 @@ void McuSupportTest::initTestCase()
 
     ON_CALL(*sdkPackage, label()).WillByDefault(Return(QString{QUL_LABEL}));
     ON_CALL(*sdkPackage, settingsKey())
-        .WillByDefault(Return(QString{Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK}));
+        .WillByDefault(Return(Key{Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK}));
     ON_CALL(*sdkPackage, environmentVariableName()).WillByDefault(Return(QString{QUL_ENV_VAR}));
     ON_CALL(*sdkPackage, cmakeVariableName()).WillByDefault(Return(QString{QUL_CMAKE_VAR}));
     ON_CALL(*sdkPackage, isValidStatus()).WillByDefault(Return(true));
@@ -487,7 +487,7 @@ void McuSupportTest::initTestCase()
     EXPECT_CALL(*armGccToolchainFilePackage, detectionPath()).WillRepeatedly(Return(FilePath{}));
 
     ON_CALL(*settingsMockPtr, getPath)
-        .WillByDefault([](const QString &, QSettings::Scope, const FilePath &m_defaultPath) {
+        .WillByDefault([](const Key &, QSettings::Scope, const FilePath &m_defaultPath) {
             return m_defaultPath;
         });
 }
@@ -685,41 +685,40 @@ void McuSupportTest::test_mapParsedToolchainIdToCorrespondingType()
 void McuSupportTest::test_legacy_createPackagesWithCorrespondingSettings_data()
 {
     QTest::addColumn<QString>("json");
-    QTest::addColumn<QSet<QString>>("expectedSettings");
+    QTest::addColumn<QSet<Key>>("expectedSettings");
 
-    QSet<QString> commonSettings{{"CypressAutoFlashUtil"},
-                                 {"MCUXpressoIDE"},
-                                 {"RenesasFlashProgrammer"},
-                                 {"Stm32CubeProgrammer"}};
+    QSet<Key> commonSettings{{"CypressAutoFlashUtil"},
+                             {"MCUXpressoIDE"},
+                             {"RenesasFlashProgrammer"},
+                             {"Stm32CubeProgrammer"}};
 
     QTest::newRow("iar_mimxrt1064_evk_freertos_json")
         << iar_mimxrt1064_evk_freertos_json
-        << QSet<QString>{{"EVK_MIMXRT1064_SDK_PATH"},
-                         {QString{Legacy::Constants::SETTINGS_KEY_FREERTOS_PREFIX}.append(
+        << QSet<Key>{{"EVK_MIMXRT1064_SDK_PATH"},
+                         {Key{Legacy::Constants::SETTINGS_KEY_FREERTOS_PREFIX}.append(
                              "IMXRT1064")},
                          "IARToolchain"}
                .unite(commonSettings);
     QTest::newRow("stm32f469i") << iar_stm32f469i_discovery_baremetal_json
-                                << QSet<QString>{{"STM32Cube_FW_F4_SDK_PATH"}, "IARToolchain"}.unite(
+                                << QSet<Key>{{"STM32Cube_FW_F4_SDK_PATH"}, "IARToolchain"}.unite(
                                        commonSettings);
     QTest::newRow("nxp1050") << armgcc_mimxrt1050_evk_freertos_json
-                             << QSet<QString>{{"EVKB_IMXRT1050_SDK_PATH"},
-                                              {QString{
-                                                  Legacy::Constants::SETTINGS_KEY_FREERTOS_PREFIX}
+                             << QSet<Key>{{"EVKB_IMXRT1050_SDK_PATH"},
+                                              {Key{Legacy::Constants::SETTINGS_KEY_FREERTOS_PREFIX}
                                                    .append("IMXRT1050")},
                                               "GNUArmEmbeddedToolchain"}
                                     .unite(commonSettings);
     QTest::newRow("armgcc_stm32h750b_discovery_baremetal_json")
         << armgcc_stm32h750b_discovery_baremetal_json
-        << QSet<QString>{{"STM32Cube_FW_H7_SDK_PATH"}, "GNUArmEmbeddedToolchain"}.unite(
+        << QSet<Key>{{"STM32Cube_FW_H7_SDK_PATH"}, "GNUArmEmbeddedToolchain"}.unite(
                commonSettings);
     QTest::newRow("armgcc_stm32f769i_discovery_freertos_json")
         << armgcc_stm32f769i_discovery_freertos_json
-        << QSet<QString>{{"STM32Cube_FW_F7_SDK_PATH"}, "GNUArmEmbeddedToolchain"}.unite(
+        << QSet<Key>{{"STM32Cube_FW_F7_SDK_PATH"}, "GNUArmEmbeddedToolchain"}.unite(
                commonSettings);
 
     QTest::newRow("ghs_rh850_d1m1a_baremetal_json")
-        << ghs_rh850_d1m1a_baremetal_json << QSet<QString>{"GHSToolchain"}.unite(commonSettings);
+        << ghs_rh850_d1m1a_baremetal_json << QSet<Key>{"GHSToolchain"}.unite(commonSettings);
 }
 
 void McuSupportTest::test_legacy_createPackagesWithCorrespondingSettings()
@@ -730,10 +729,10 @@ void McuSupportTest::test_legacy_createPackagesWithCorrespondingSettings()
         targetsFromDescriptions({description}, settingsMockPtr, sdkPackagePtr, runLegacy)};
     Q_UNUSED(targets);
 
-    QSet<QString> settings = transform<QSet<QString>>(packages, [](const auto &package) {
+    QSet<Key> settings = transform<QSet<Key>>(packages, [](const auto &package) {
         return package->settingsKey();
     });
-    QFETCH(QSet<QString>, expectedSettings);
+    QFETCH(QSet<Key>, expectedSettings);
     QVERIFY(settings.contains(expectedSettings));
 }
 
@@ -851,7 +850,7 @@ void McuSupportTest::test_useFallbackPathForToolchainWhenPathFromSettingsIsNotAv
                                            Utils::PathChooser::Kind::ExistingDirectory};
     McuTargetDescription::Toolchain toolchainDescription{armGcc, {}, compilerDescription, {}};
 
-    EXPECT_CALL(*settingsMockPtr, getPath(QString{armGccDirectorySetting}, _, FilePath{fallbackDir}))
+    EXPECT_CALL(*settingsMockPtr, getPath(Key{armGccDirectorySetting}, _, FilePath{fallbackDir}))
         .Times(2)
         .WillRepeatedly(Return(FilePath{fallbackDir}));
 
@@ -875,7 +874,7 @@ void McuSupportTest::test_usePathFromSettingsForToolchainPath()
                                            Utils::PathChooser::Kind::ExistingDirectory};
     McuTargetDescription::Toolchain toolchainDescription{armGcc, {}, compilerDescription, {}};
 
-    EXPECT_CALL(*settingsMockPtr, getPath(QString{armGccDirectorySetting}, _, FilePath{empty}))
+    EXPECT_CALL(*settingsMockPtr, getPath(Key{armGccDirectorySetting}, _, FilePath{empty}))
         .Times(2)
         .WillOnce(Return(FilePath{empty}))      // system scope settings
         .WillOnce(Return(FilePath{armGccDir})); // user scope settings
@@ -951,7 +950,7 @@ void McuSupportTest::test_legacy_createTargetWithToolchainPackages_data()
     QTest::addColumn<QString>("toolchainFilePath");
     QTest::addColumn<QString>("toolchainFileDefaultPath");
     QTest::addColumn<QString>("compilerPath");
-    QTest::addColumn<QString>("compilerSetting");
+    QTest::addColumn<Key>("compilerSetting");
     QTest::addColumn<QStringList>("versions");
 
     QTest::newRow("armgcc_mimxrt1050_evk_freertos_json")
@@ -992,13 +991,13 @@ void McuSupportTest::test_legacy_createTargetWithToolchainPackages()
     QFETCH(QString, toolchainFilePath);
     QFETCH(QString, toolchainFileDefaultPath);
     QFETCH(QString, compilerPath);
-    QFETCH(QString, compilerSetting);
+    QFETCH(Key, compilerSetting);
     QFETCH(QStringList, versions);
 
     const McuTargetDescription description = parseDescriptionJson(json.toLocal8Bit());
 
     EXPECT_CALL(*settingsMockPtr,
-                getPath(QString{Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK}, _, _))
+                getPath(Key{Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK}, _, _))
         .WillRepeatedly(Return(FilePath::fromUserInput(qtForMcuSdkPath)));
     EXPECT_CALL(*settingsMockPtr, getPath(compilerSetting, _, _))
         .WillRepeatedly(Return(FilePath::fromUserInput(compilerPath)));
@@ -1026,14 +1025,14 @@ void McuSupportTest::test_createTargetWithToolchainPackages()
     QFETCH(QString, toolchainFilePath);
     QFETCH(QString, toolchainFileDefaultPath);
     QFETCH(QString, compilerPath);
-    QFETCH(QString, compilerSetting);
+    QFETCH(Key, compilerSetting);
     QFETCH(QStringList, versions);
 
     EXPECT_CALL(*settingsMockPtr, getPath(compilerSetting, _, _))
         .WillRepeatedly(Return(FilePath::fromUserInput(compilerPath)));
 
     EXPECT_CALL(*settingsMockPtr,
-                getPath(QString{Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK}, _, _))
+                getPath(Key{Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK}, _, _))
         .WillRepeatedly(Return(FilePath::fromUserInput(qtForMcuSdkPath)));
 
     const McuTargetDescription description = parseDescriptionJson(json.toLocal8Bit());
@@ -1141,7 +1140,7 @@ void McuSupportTest::test_legacy_createFreeRtosPackage_data()
 {
     QTest::addColumn<QString>("json");
     QTest::addColumn<QStringList>("versions");
-    QTest::addColumn<QString>("expectedSettingsKey");
+    QTest::addColumn<Key>("expectedSettingsKey");
     QTest::addColumn<FilePath>("expectedPath");
     QTest::addColumn<FilePath>("expectedDetectionPath");
 
@@ -1171,7 +1170,7 @@ void McuSupportTest::test_legacy_createFreeRtosPackage()
 {
     QFETCH(QString, json);
     QFETCH(QStringList, versions);
-    QFETCH(QString, expectedSettingsKey);
+    QFETCH(Key, expectedSettingsKey);
     QFETCH(FilePath, expectedPath);
     QFETCH(FilePath, expectedDetectionPath);
 
@@ -1200,13 +1199,13 @@ void McuSupportTest::test_createFreeRtosPackage()
 {
     QFETCH(QString, json);
     QFETCH(QStringList, versions);
-    QFETCH(QString, expectedSettingsKey);
+    QFETCH(Key, expectedSettingsKey);
     QFETCH(FilePath, expectedPath);
     QFETCH(FilePath, expectedDetectionPath);
 
     McuTargetDescription targetDescription{parseDescriptionJson(json.toLocal8Bit())};
 
-    EXPECT_CALL(*settingsMockPtr, getPath(targetDescription.boardSdk.envVar, _, _))
+    EXPECT_CALL(*settingsMockPtr, getPath(keyFromString(targetDescription.boardSdk.envVar), _, _))
         .WillRepeatedly(Return(FilePath::fromString(boardSdkDir)));
 
     auto [targets, packages]{targetFactory.createTargets(targetDescription, sdkPackagePtr)};
@@ -1254,7 +1253,7 @@ void McuSupportTest::test_legacy_doNOTcreateFreeRtosPackageForMetalVariants()
 void McuSupportTest::test_legacy_createQtMCUsPackage()
 {
     EXPECT_CALL(*settingsMockPtr,
-                getPath(QString{Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK}, _, _))
+                getPath(Key{Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK}, _, _))
         .WillRepeatedly(Return(FilePath::fromUserInput(qtForMcuSdkPath)));
 
     McuPackagePtr qtForMCUsSDK = createQtForMCUsPackage(settingsMockPtr);
@@ -1550,13 +1549,13 @@ void McuSupportTest::test_legacy_createThirdPartyPackage()
     QFETCH(QString, json);
     QFETCH(QString, path);
     QFETCH(QString, defaultPath);
-    QFETCH(QString, setting);
+    QFETCH(Key, setting);
     QFETCH(QString, cmakeVar);
     QFETCH(QString, envVar);
     QFETCH(QString, label);
     QFETCH(QString, detectionPath);
 
-    EXPECT_CALL(*settingsMockPtr, getPath(QString{setting}, _, _))
+    EXPECT_CALL(*settingsMockPtr, getPath(Key{setting}, _, _))
         .Times(2)
         .WillRepeatedly(Return(FilePath::fromUserInput(defaultPath)));
 
@@ -1577,7 +1576,7 @@ void McuSupportTest::test_createThirdPartyPackage_data()
     QTest::addColumn<QString>("json");
     QTest::addColumn<QString>("path");
     QTest::addColumn<QString>("defaultPath");
-    QTest::addColumn<QString>("setting");
+    QTest::addColumn<Key>("setting");
     QTest::addColumn<QString>("cmakeVar");
     QTest::addColumn<QString>("envVar");
     QTest::addColumn<QString>("label");
@@ -1628,7 +1627,7 @@ void McuSupportTest::test_createThirdPartyPackage()
     QFETCH(QString, json);
     QFETCH(QString, path);
     QFETCH(QString, defaultPath);
-    QFETCH(QString, setting);
+    QFETCH(Key, setting);
     QFETCH(QString, cmakeVar);
     QFETCH(QString, envVar);
     QFETCH(QString, label);
@@ -1636,11 +1635,11 @@ void McuSupportTest::test_createThirdPartyPackage()
 
     McuTargetDescription targetDescription{parseDescriptionJson(json.toLocal8Bit())};
 
-    EXPECT_CALL(*settingsMockPtr, getPath(QString{setting}, QSettings::SystemScope, _))
+    EXPECT_CALL(*settingsMockPtr, getPath(Key{setting}, QSettings::SystemScope, _))
         .Times(testing::AtMost(1))
         .WillOnce(Return(FilePath::fromUserInput(defaultPath)));
 
-    EXPECT_CALL(*settingsMockPtr, getPath(QString{setting}, QSettings::UserScope, _))
+    EXPECT_CALL(*settingsMockPtr, getPath(Key{setting}, QSettings::UserScope, _))
         .Times(testing::AtMost(1))
         .WillOnce(Return(FilePath::fromUserInput(path)));
 
@@ -1664,7 +1663,7 @@ void McuSupportTest::test_createThirdPartyPackage()
 
 void McuSupportTest::test_legacy_createCypressProgrammer3rdPartyPackage()
 {
-    EXPECT_CALL(*settingsMockPtr, getPath(QString{cypressProgrammerSetting}, _, _))
+    EXPECT_CALL(*settingsMockPtr, getPath(Key{cypressProgrammerSetting}, _, _))
         .Times(2)
         .WillRepeatedly(Return(FilePath::fromUserInput(defaultToolPath)));
 
@@ -1684,11 +1683,11 @@ void McuSupportTest::test_createJLink3rdPartyPackage()
 {
     McuTargetDescription targetDescription{parseDescriptionJson(armgcc_ek_ra6m3g_baremetal_json)};
 
-    EXPECT_CALL(*settingsMockPtr, getPath(QString{jlinkSetting}, QSettings::SystemScope, _))
+    EXPECT_CALL(*settingsMockPtr, getPath(Key{jlinkSetting}, QSettings::SystemScope, _))
         .Times(testing::AtMost(1))
         .WillOnce(Return(FilePath::fromUserInput(jlinkPath)));
 
-    EXPECT_CALL(*settingsMockPtr, getPath(QString{jlinkSetting}, QSettings::UserScope, _))
+    EXPECT_CALL(*settingsMockPtr, getPath(Key{jlinkSetting}, QSettings::UserScope, _))
         .Times(testing::AtMost(1))
         .WillOnce(Return(FilePath::fromUserInput(jlinkPath)));
 
diff --git a/src/plugins/perfprofiler/perfsettings.cpp b/src/plugins/perfprofiler/perfsettings.cpp
index 84a8fdf736..9e9781a4fd 100644
--- a/src/plugins/perfprofiler/perfsettings.cpp
+++ b/src/plugins/perfprofiler/perfsettings.cpp
@@ -425,13 +425,13 @@ PerfSettings::~PerfSettings()
 
 void PerfSettings::readGlobalSettings()
 {
-    QVariantMap defaults;
+    Store defaults;
 
     // Read stored values
     QSettings *settings = Core::ICore::settings();
     settings->beginGroup(QLatin1String(Constants::AnalyzerSettingsGroupId));
-    QVariantMap map = defaults;
-    for (QVariantMap::ConstIterator it = defaults.constBegin(); it != defaults.constEnd(); ++it)
+    Store map = defaults;
+    for (Store::ConstIterator it = defaults.constBegin(); it != defaults.constEnd(); ++it)
         map.insert(it.key(), settings->value(it.key(), it.value()));
     settings->endGroup();
 
@@ -442,9 +442,9 @@ void PerfSettings::writeGlobalSettings() const
 {
     QSettings *settings = Core::ICore::settings();
     settings->beginGroup(QLatin1String(Constants::AnalyzerSettingsGroupId));
-    QVariantMap map;
+    Store map;
     toMap(map);
-    for (QVariantMap::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it)
+    for (Store::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it)
         settings->setValue(it.key(), it.value());
     settings->endGroup();
 }
@@ -474,7 +474,7 @@ void PerfSettings::addPerfRecordArguments(CommandLine *cmd) const
 void PerfSettings::resetToDefault()
 {
     PerfSettings defaults;
-    QVariantMap map;
+    Store map;
     defaults.toMap(map);
     fromMap(map);
 }
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
index fce7eb944d..1fc8f83bd0 100644
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
@@ -31,7 +31,7 @@ using namespace ProjectExplorer;
 
 namespace QmlProfiler::Internal {
 
-const QString QmlServerUrl = "QmlServerUrl";
+const char QmlServerUrl[] = "QmlServerUrl";
 
 //
 // QmlProfilerRunControlPrivate
diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp
index 420b3fbb81..d8e7ab5dcf 100644
--- a/src/plugins/qnx/qnxqtversion.cpp
+++ b/src/plugins/qnx/qnxqtversion.cpp
@@ -109,14 +109,14 @@ QString QnxQtVersion::cpuDir() const
     return QnxUtils::cpuDirFromAbi(abis.at(0));
 }
 
-QVariantMap QnxQtVersion::toMap() const
+Store QnxQtVersion::toMap() const
 {
-    QVariantMap result = QtVersion::toMap();
+    Store result = QtVersion::toMap();
     result.insert(SDP_PATH_KEY, sdpPath().toSettings());
     return result;
 }
 
-void QnxQtVersion::fromMap(const Store &map, const Utils::FilePath &)
+void QnxQtVersion::fromMap(const Store &map, const FilePath &)
 {
     QtVersion::fromMap(map);
     setSdpPath(FilePath::fromSettings(map.value(SDP_PATH_KEY)));
diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp
index 210caba878..301bdec83b 100644
--- a/src/plugins/qnx/qnxsettingspage.cpp
+++ b/src/plugins/qnx/qnxsettingspage.cpp
@@ -50,18 +50,18 @@ using namespace Debugger;
 
 namespace Qnx::Internal {
 
-const QLatin1String QNXEnvFileKey("EnvFile");
-const QLatin1String QNXVersionKey("QNXVersion");
+const char QNXEnvFileKey[] = "EnvFile";
+const char QNXVersionKey[] = "QNXVersion";
 // For backward compatibility
-const QLatin1String SdpEnvFileKey("NDKEnvFile");
+const char SdpEnvFileKey[] = "NDKEnvFile";
 
-const QLatin1String QNXConfiguration("QNX_CONFIGURATION");
-const QLatin1String QNXTarget("QNX_TARGET");
-const QLatin1String QNXHost("QNX_HOST");
+const char QNXConfiguration[] = "QNX_CONFIGURATION";
+const char QNXTarget[] = "QNX_TARGET";
+const char QNXHost[] = "QNX_HOST";
 
-const QLatin1String QNXConfigDataKey("QNXConfiguration.");
-const QLatin1String QNXConfigCountKey("QNXConfiguration.Count");
-const QLatin1String QNXConfigsFileVersionKey("Version");
+const char QNXConfigDataKey[] = "QNXConfiguration.";
+const char QNXConfigCountKey[] = "QNXConfiguration.Count";
+const char QNXConfigsFileVersionKey[] = "Version";
 
 static FilePath qnxConfigSettingsFileName()
 {
@@ -84,11 +84,11 @@ public:
         m_envFile = FilePath::fromString(envFilePath);
     }
 
-    QVariantMap toMap() const
+    Store toMap() const
     {
-        QVariantMap data;
-        data.insert(QLatin1String(QNXEnvFileKey), m_envFile.toString());
-        data.insert(QLatin1String(QNXVersionKey), m_version.toString());
+        Store data;
+        data.insert(QNXEnvFileKey, m_envFile.toString());
+        data.insert(QNXVersionKey, m_version.toString());
         return data;
     }
 
@@ -434,19 +434,19 @@ public:
 
     void saveConfigs()
     {
-        QVariantMap data;
-        data.insert(QLatin1String(QNXConfigsFileVersionKey), 1);
+        Store data;
+        data.insert(QNXConfigsFileVersionKey, 1);
         int count = 0;
         for (const QnxConfiguration &config : std::as_const(m_configurations)) {
-            QVariantMap tmp = config.toMap();
+            Store tmp = config.toMap();
             if (tmp.isEmpty())
                 continue;
 
-            data.insert(QNXConfigDataKey + QString::number(count), tmp);
+            data.insert(QNXConfigDataKey + Key::number(count), QVariant::fromValue(tmp));
             ++count;
         }
 
-        data.insert(QLatin1String(QNXConfigCountKey), count);
+        data.insert(QNXConfigCountKey, count);
         m_writer.save(data, Core::ICore::dialogParent());
     }
 
@@ -456,15 +456,15 @@ public:
         if (!reader.load(qnxConfigSettingsFileName()))
             return;
 
-        QVariantMap data = reader.restoreValues();
+        Store data = reader.restoreValues();
         int count = data.value(QNXConfigCountKey, 0).toInt();
         for (int i = 0; i < count; ++i) {
-            const QString key = QNXConfigDataKey + QString::number(i);
+            const Key key = QNXConfigDataKey + Key::number(i);
             if (!data.contains(key))
                 continue;
 
             QnxConfiguration config;
-            config.fromMap(data.value(key).toMap());
+            config.fromMap(data.value(key).value<Store>());
             m_configurations[config.m_envFile] = config;
         }
     }
diff --git a/src/plugins/qnx/qnxtoolchain.cpp b/src/plugins/qnx/qnxtoolchain.cpp
index 130945c976..2e66fecace 100644
--- a/src/plugins/qnx/qnxtoolchain.cpp
+++ b/src/plugins/qnx/qnxtoolchain.cpp
@@ -197,12 +197,12 @@ QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc)
     , m_abiWidget(new AbiWidget)
 {
     m_compilerCommand->setExpectedKind(PathChooser::ExistingCommand);
-    m_compilerCommand->setHistoryCompleter(QLatin1String("Qnx.ToolChain.History"));
+    m_compilerCommand->setHistoryCompleter("Qnx.ToolChain.History");
     m_compilerCommand->setFilePath(tc->compilerCommand());
     m_compilerCommand->setEnabled(!tc->isAutoDetected());
 
     m_sdpPath->setExpectedKind(PathChooser::ExistingDirectory);
-    m_sdpPath->setHistoryCompleter(QLatin1String("Qnx.Sdp.History"));
+    m_sdpPath->setHistoryCompleter("Qnx.Sdp.History");
     m_sdpPath->setFilePath(tc->sdpPath());
     m_sdpPath->setEnabled(!tc->isAutoDetected());
 
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
index 1debbc230c..1130767a92 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
@@ -81,7 +81,7 @@ void AbstractRemoteLinuxDeployStep::setInternalInitializer(
     d->internalInit = init;
 }
 
-void AbstractRemoteLinuxDeployStep::fromMap(const Utils::Store &map)
+void AbstractRemoteLinuxDeployStep::fromMap(const Store &map)
 {
     BuildStep::fromMap(map);
     if (hasError())
@@ -89,7 +89,7 @@ void AbstractRemoteLinuxDeployStep::fromMap(const Utils::Store &map)
     d->deployTimes.importDeployTimes(map);
 }
 
-void AbstractRemoteLinuxDeployStep::toMap(Utils::Store &map) const
+void AbstractRemoteLinuxDeployStep::toMap(Store &map) const
 {
     BuildStep::toMap(map);
     map.insert(d->deployTimes.exportDeployTimes());
diff --git a/src/plugins/remotelinux/deploymenttimeinfo.cpp b/src/plugins/remotelinux/deploymenttimeinfo.cpp
index d403534c60..d3c9b02856 100644
--- a/src/plugins/remotelinux/deploymenttimeinfo.cpp
+++ b/src/plugins/remotelinux/deploymenttimeinfo.cpp
@@ -103,9 +103,9 @@ bool DeploymentTimeInfo::hasRemoteFileChanged(const DeployableFile &deployableFi
     return !lastDeployed.remote.isValid() || remoteTimestamp != lastDeployed.remote;
 }
 
-QVariantMap DeploymentTimeInfo::exportDeployTimes() const
+Store DeploymentTimeInfo::exportDeployTimes() const
 {
-    QVariantMap map;
+    Store map;
     QVariantList hostList;
     QVariantList fileList;
     QVariantList sysrootList;
@@ -122,33 +122,31 @@ QVariantMap DeploymentTimeInfo::exportDeployTimes() const
         localTimeList << it.value().local;
         remoteTimeList << it.value().remote;
     }
-    map.insert(QLatin1String(LastDeployedHostsKey), hostList);
-    map.insert(QLatin1String(LastDeployedSysrootsKey), sysrootList);
-    map.insert(QLatin1String(LastDeployedFilesKey), fileList);
-    map.insert(QLatin1String(LastDeployedRemotePathsKey), remotePathList);
-    map.insert(QLatin1String(LastDeployedLocalTimesKey), localTimeList);
-    map.insert(QLatin1String(LastDeployedRemoteTimesKey), remoteTimeList);
+    map.insert(LastDeployedHostsKey, hostList);
+    map.insert(LastDeployedSysrootsKey, sysrootList);
+    map.insert(LastDeployedFilesKey, fileList);
+    map.insert(LastDeployedRemotePathsKey, remotePathList);
+    map.insert(LastDeployedLocalTimesKey, localTimeList);
+    map.insert(LastDeployedRemoteTimesKey, remoteTimeList);
     return map;
 }
 
-void DeploymentTimeInfo::importDeployTimes(const QVariantMap &map)
+void DeploymentTimeInfo::importDeployTimes(const Store &map)
 {
-    const QVariantList &hostList = map.value(QLatin1String(LastDeployedHostsKey)).toList();
-    const QVariantList &sysrootList = map.value(QLatin1String(LastDeployedSysrootsKey)).toList();
-    const QVariantList &fileList = map.value(QLatin1String(LastDeployedFilesKey)).toList();
-    const QVariantList &remotePathList
-        = map.value(QLatin1String(LastDeployedRemotePathsKey)).toList();
+    const QVariantList &hostList = map.value(LastDeployedHostsKey).toList();
+    const QVariantList &sysrootList = map.value(LastDeployedSysrootsKey).toList();
+    const QVariantList &fileList = map.value(LastDeployedFilesKey).toList();
+    const QVariantList &remotePathList = map.value(LastDeployedRemotePathsKey).toList();
 
     QVariantList localTimesList;
-    const auto localTimes = map.find(QLatin1String(LastDeployedLocalTimesKey));
+    const auto localTimes = map.find(LastDeployedLocalTimesKey);
     if (localTimes != map.end()) {
         localTimesList = localTimes.value().toList();
     } else {
-        localTimesList = map.value(QLatin1String(LastDeployedTimesKey)).toList();
+        localTimesList = map.value(LastDeployedTimesKey).toList();
     }
 
-    const QVariantList remoteTimesList
-            = map.value(QLatin1String(LastDeployedRemoteTimesKey)).toList();
+    const QVariantList remoteTimesList = map.value(LastDeployedRemoteTimesKey).toList();
 
     const int elemCount = qMin(qMin(qMin(hostList.size(), fileList.size()),
                                     qMin(remotePathList.size(), localTimesList.size())),
diff --git a/src/plugins/remotelinux/deploymenttimeinfo.h b/src/plugins/remotelinux/deploymenttimeinfo.h
index 6615dd1c61..69ec215bce 100644
--- a/src/plugins/remotelinux/deploymenttimeinfo.h
+++ b/src/plugins/remotelinux/deploymenttimeinfo.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QVariantMap>
+#include <utils/store.h>
 
 QT_BEGIN_NAMESPACE
 class QDateTime;
@@ -24,8 +24,8 @@ public:
     DeploymentTimeInfo();
     ~DeploymentTimeInfo();
 
-    void importDeployTimes(const QVariantMap &map);
-    QVariantMap exportDeployTimes() const;
+    void importDeployTimes(const Utils::Store &map);
+    Utils::Store exportDeployTimes() const;
 
     void saveDeploymentTimeStamp(const ProjectExplorer::DeployableFile &deployableFile,
                                  const ProjectExplorer::Kit *kit,
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
index 566cf3e510..09895a7ad7 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
@@ -283,7 +283,7 @@ void GenericLinuxDeviceConfigurationWidget::initGui()
     m_portsWarningLabel->setToolTip(QLatin1String("<font color=\"red\">")
         + Tr::tr("You will need at least one port.") + QLatin1String("</font>"));
     m_keyFileLineEdit->setExpectedKind(PathChooser::File);
-    m_keyFileLineEdit->setHistoryCompleter(QLatin1String("Ssh.KeyFile.History"));
+    m_keyFileLineEdit->setHistoryCompleter("Ssh.KeyFile.History");
     m_keyFileLineEdit->lineEdit()->setMinimumWidth(0);
     QRegularExpressionValidator * const portsValidator
         = new QRegularExpressionValidator(QRegularExpression(PortList::regularExpression()), this);
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
index 90014e362c..14005aa1a7 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
@@ -103,7 +103,7 @@ void RemoteLinuxEnvironmentAspect::fromMap(const Store &map)
 {
     ProjectExplorer::EnvironmentAspect::fromMap(map);
 
-    const auto version = map.value(QLatin1String(VERSION_KEY), 0).toInt();
+    const auto version = map.value(VERSION_KEY, 0).toInt();
     if (version == 0) {
         // In Qt Creator versions prior to 4.3 RemoteLinux included DISPLAY=:0.0 in the base
         // environment, if DISPLAY was not set. In order to keep existing projects expecting
@@ -120,7 +120,7 @@ void RemoteLinuxEnvironmentAspect::fromMap(const Store &map)
 void RemoteLinuxEnvironmentAspect::toMap(Store &map) const
 {
     ProjectExplorer::EnvironmentAspect::toMap(map);
-    map.insert(QLatin1String(VERSION_KEY), ENVIRONMENTASPECT_VERSION);
+    map.insert(VERSION_KEY, ENVIRONMENTASPECT_VERSION);
 }
 
 } // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index 734c17408e..8d75e6e6c7 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -62,7 +62,7 @@ public:
             return prj->deploymentKnowledge() == DeploymentKnowledge::Bad
                    && prj->hasMakeInstallEquivalent();
         };
-        setPostRestore([needsMakeInstall](DeployConfiguration *dc, const QVariantMap &map) {
+        setPostRestore([needsMakeInstall](DeployConfiguration *dc, const Store &map) {
             // 4.9 -> 4.10. See QTCREATORBUG-22689.
             if (map.value("_checkMakeInstall").toBool() && needsMakeInstall(dc->target())) {
                 dc->stepList()->insertStep(0, Constants::MakeInstallStepId);
diff --git a/src/plugins/valgrind/valgrindsettings.cpp b/src/plugins/valgrind/valgrindsettings.cpp
index 3e6046fdb6..b520f32892 100644
--- a/src/plugins/valgrind/valgrindsettings.cpp
+++ b/src/plugins/valgrind/valgrindsettings.cpp
@@ -187,7 +187,7 @@ ValgrindSettings::ValgrindSettings(bool global)
     // Note that this is used twice, once for project settings in the .user files
     // and once for global settings in QtCreator.ini. This uses intentionally
     // the same key to facilitate copying using fromMap/toMap.
-    QString base = "Analyzer.Valgrind.";
+    Key base = "Analyzer.Valgrind.";
 
     valgrindExecutable.setSettingsKey(base + "ValgrindExecutable");
     valgrindExecutable.setDefaultValue("valgrind");