Use Utils::Storage instead of QVariantMap in a few places

Change-Id: I02833cf2bc3caaadc22ff93ae530e4aebe4c3868
Reviewed-by: Marcus Tillmanns <[email protected]>

191 files changed, 524 insertions, 490 deletions

diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index cbb0b300708..c02bba6a127 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -583,7 +583,7 @@ void BaseAspect::saveToMap(QVariantMap &data, const QVariant &value,
 /*!
     Retrieves the internal value of this BaseAspect from the QVariantMap \a map.
 */
-void BaseAspect::fromMap(const QVariantMap &map)
+void BaseAspect::fromMap(const Storage &map)
 {
     if (settingsKey().isEmpty())
         return;
@@ -594,7 +594,7 @@ void BaseAspect::fromMap(const QVariantMap &map)
 /*!
     Stores the internal value of this BaseAspect into the QVariantMap \a map.
 */
-void BaseAspect::toMap(QVariantMap &map) const
+void BaseAspect::toMap(Storage &map) const
 {
     if (settingsKey().isEmpty())
         return;
@@ -692,13 +692,13 @@ public:
 class CheckableAspectImplementation
 {
 public:
-    void fromMap(const QVariantMap &map)
+    void fromMap(const Storage &map)
     {
         if (m_checked)
             m_checked->fromMap(map);
     }
 
-    void toMap(QVariantMap &map)
+    void toMap(Storage &map)
     {
         if (m_checked)
             m_checked->toMap(map);
@@ -921,7 +921,7 @@ void StringAspect::setValueAcceptor(StringAspect::ValueAcceptor &&acceptor)
 /*!
     \reimp
 */
-void StringAspect::fromMap(const QVariantMap &map)
+void StringAspect::fromMap(const Storage &map)
 {
     if (!settingsKey().isEmpty())
         setValue(map.value(settingsKey(), defaultValue()).toString(), BeQuiet);
@@ -931,7 +931,7 @@ void StringAspect::fromMap(const QVariantMap &map)
 /*!
     \reimp
 */
-void StringAspect::toMap(QVariantMap &map) const
+void StringAspect::toMap(Storage &map) const
 {
     saveToMap(map, value(), defaultValue(), settingsKey());
     d->m_checkerImpl.toMap(map);
@@ -1440,7 +1440,7 @@ void FilePathAspect::addToLayout(Layouting::LayoutItem &parent)
 /*!
     \reimp
 */
-void FilePathAspect::fromMap(const QVariantMap &map)
+void FilePathAspect::fromMap(const Storage &map)
 {
     if (!settingsKey().isEmpty())
         setValue(map.value(settingsKey(), defaultValue()).toString(), BeQuiet);
@@ -1450,7 +1450,7 @@ void FilePathAspect::fromMap(const QVariantMap &map)
 /*!
     \reimp
 */
-void FilePathAspect::toMap(QVariantMap &map) const
+void FilePathAspect::toMap(Storage &map) const
 {
     saveToMap(map, value(), defaultValue(), settingsKey());
     d->m_checkerImpl.toMap(map);
@@ -2514,7 +2514,7 @@ const QList<BaseAspect *> &AspectContainer::aspects() const
     return d->m_items;
 }
 
-void AspectContainer::fromMap(const QVariantMap &map)
+void AspectContainer::fromMap(const Storage &map)
 {
     for (BaseAspect *aspect : std::as_const(d->m_items))
         aspect->fromMap(map);
@@ -2523,7 +2523,7 @@ void AspectContainer::fromMap(const QVariantMap &map)
 
 }
 
-void AspectContainer::toMap(QVariantMap &map) const
+void AspectContainer::toMap(Storage &map) const
 {
     for (BaseAspect *aspect : std::as_const(d->m_items))
         aspect->toMap(map);
diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h
index 5779d45dd90..7e3b6942a88 100644
--- a/src/libs/utils/aspects.h
+++ b/src/libs/utils/aspects.h
@@ -8,6 +8,7 @@
 #include "infolabel.h"
 #include "macroexpander.h"
 #include "pathchooser.h"
+#include "storage.h"
 
 #include <functional>
 #include <memory>
@@ -100,9 +101,9 @@ public:
 
     AspectContainer *container() const;
 
-    virtual void fromMap(const QVariantMap &map);
-    virtual void toMap(QVariantMap &map) const;
-    virtual void toActiveMap(QVariantMap &map) const { toMap(map); }
+    virtual void fromMap(const Utils::Storage &map);
+    virtual void toMap(Utils::Storage &map) const;
+    virtual void toActiveMap(Utils::Storage &map) const { toMap(map); }
 
     virtual void addToLayout(Layouting::LayoutItem &parent);
 
@@ -557,8 +558,8 @@ public:
     };
     void setDisplayStyle(DisplayStyle style);
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
 signals:
     void validChanged(bool validState);
@@ -626,8 +627,8 @@ public:
 
     void addToLayout(Layouting::LayoutItem &parent) override;
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
 signals:
     void validChanged(bool validState);
@@ -831,8 +832,8 @@ public:
     void registerAspect(BaseAspect *aspect, bool takeOwnership = false);
     void registerAspects(const AspectContainer &aspects);
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     void readSettings() override;
     void writeSettings() const override;
diff --git a/src/libs/utils/displayname.cpp b/src/libs/utils/displayname.cpp
index b8402c94021..9758b440c6e 100644
--- a/src/libs/utils/displayname.cpp
+++ b/src/libs/utils/displayname.cpp
@@ -35,13 +35,13 @@ bool DisplayName::usesDefaultValue() const
     return m_value.isEmpty();
 }
 
-void DisplayName::toMap(QVariantMap &map, const QString &key) const
+void DisplayName::toMap(Storage &map, const QString &key) const
 {
     if (m_forceSerialization || !usesDefaultValue())
         map.insert(key, m_value);
 }
 
-void DisplayName::fromMap(const QVariantMap &map, const QString &key)
+void DisplayName::fromMap(const Storage &map, const QString &key)
 {
     m_value = map.value(key).toString();
 }
diff --git a/src/libs/utils/displayname.h b/src/libs/utils/displayname.h
index b7a9b5f90d0..0998eafd6eb 100644
--- a/src/libs/utils/displayname.h
+++ b/src/libs/utils/displayname.h
@@ -3,10 +3,7 @@
 
 #pragma once
 
-#include "utils_global.h"
-
-#include <QString>
-#include <QVariantMap>
+#include "storage.h"
 
 namespace Utils {
 
@@ -24,8 +21,8 @@ public:
     bool usesDefaultValue() const;
     void forceSerialization() { m_forceSerialization = true; }
 
-    void toMap(QVariantMap &map, const QString &key) const;
-    void fromMap(const QVariantMap &map, const QString &key);
+    void toMap(Utils::Storage &map, const Key &key) const;
+    void fromMap(const Utils::Storage &map, const Key &key);
 
 private:
     QString m_value;
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index 4286fcc4e3a..a98dad864c2 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -879,7 +879,7 @@ void AndroidBuildApkStep::updateBuildToolsVersionInJsonFile()
     }
 }
 
-void AndroidBuildApkStep::fromMap(const QVariantMap &map)
+void AndroidBuildApkStep::fromMap(const Storage &map)
 {
     m_keystorePath = FilePath::fromSettings(map.value(KeystoreLocationKey));
     m_signPackage = false; // don't restore this
@@ -893,7 +893,7 @@ void AndroidBuildApkStep::fromMap(const QVariantMap &map)
     ProjectExplorer::BuildStep::fromMap(map);
 }
 
-void AndroidBuildApkStep::toMap(QVariantMap &map) const
+void AndroidBuildApkStep::toMap(Storage &map) const
 {
     ProjectExplorer::AbstractProcessStep::toMap(map);
     map.insert(KeystoreLocationKey, m_keystorePath.toSettings());
diff --git a/src/plugins/android/androidbuildapkstep.h b/src/plugins/android/androidbuildapkstep.h
index b746ddde064..956e91d8303 100644
--- a/src/plugins/android/androidbuildapkstep.h
+++ b/src/plugins/android/androidbuildapkstep.h
@@ -23,8 +23,8 @@ class AndroidBuildApkStep : public ProjectExplorer::AbstractProcessStep
 public:
     AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, Utils::Id id);
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     // signing
     Utils::FilePath keystorePath() const;
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index a74e94272e1..520aceb4eab 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -214,7 +214,7 @@ void AndroidDevice::addActionsIfNotFound()
     }
 }
 
-void AndroidDevice::fromMap(const QVariantMap &map)
+void AndroidDevice::fromMap(const Storage &map)
 {
     IDevice::fromMap(map);
     initAvdSettings();
diff --git a/src/plugins/android/androiddevice.h b/src/plugins/android/androiddevice.h
index cf8046cfa95..1ac5d349c96 100644
--- a/src/plugins/android/androiddevice.h
+++ b/src/plugins/android/androiddevice.h
@@ -55,7 +55,7 @@ public:
     QString openGLStatus() const;
 
 protected:
-    void fromMap(const QVariantMap &map) final;
+    void fromMap(const Utils::Storage &map) final;
 
 private:
     void addActionsIfNotFound();
diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp
index 98636857355..ebfb40c6f4a 100644
--- a/src/plugins/android/androidrunconfiguration.cpp
+++ b/src/plugins/android/androidrunconfiguration.cpp
@@ -32,13 +32,13 @@ public:
         : StringAspect(container)
     {}
 
-    void fromMap(const QVariantMap &map) final
+    void fromMap(const Storage &map) final
     {
         // Pre Qt Creator 5.0 hack: Reads QStringList as QString
         setValue(map.value(settingsKey()).toStringList().join('\n'));
     }
 
-    void toMap(QVariantMap &map) const final
+    void toMap(Storage &map) const final
     {
         // Pre Qt Creator 5.0 hack: Writes QString as QStringList
         map.insert(settingsKey(), value().split('\n'));
diff --git a/src/plugins/android/androidsdkdownloader.cpp b/src/plugins/android/androidsdkdownloader.cpp
index 4e465514622..ececc547481 100644
--- a/src/plugins/android/androidsdkdownloader.cpp
+++ b/src/plugins/android/androidsdkdownloader.cpp
@@ -183,7 +183,7 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
     };
 
     const Group root {
-        Storage(storage),
+        Tasking::Storage(storage),
         NetworkQueryTask(onQuerySetup, onQueryDone, onQueryError),
         UnarchiverTask(onUnarchiveSetup, onUnarchiverDone, onUnarchiverError)
     };
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index 50a850aa192..e0d0e6180f5 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -101,7 +101,7 @@ void AndroidToolChain::addToEnvironment(Environment &env) const
     env.set(QLatin1String("ANDROID_SDK_ROOT"), config.sdkLocation().toUserOutput());
 }
 
-void AndroidToolChain::fromMap(const QVariantMap &data)
+void AndroidToolChain::fromMap(const Storage &data)
 {
     ClangToolChain::fromMap(data);
     if (hasError())
diff --git a/src/plugins/android/androidtoolchain.h b/src/plugins/android/androidtoolchain.h
index 707125391cb..c8605f5dd8b 100644
--- a/src/plugins/android/androidtoolchain.h
+++ b/src/plugins/android/androidtoolchain.h
@@ -22,7 +22,7 @@ public:
 
     QStringList suggestedMkspecList() const override;
     Utils::FilePath makeCommand(const Utils::Environment &environment) const override;
-    void fromMap(const QVariantMap &data) override;
+    void fromMap(const Utils::Storage &data) override;
 
     void setNdkLocation(const Utils::FilePath &ndkLocation);
     Utils::FilePath ndkLocation() const;
diff --git a/src/plugins/android/javalanguageserver.cpp b/src/plugins/android/javalanguageserver.cpp
index f3448461a1d..6cb10c1f6c9 100644
--- a/src/plugins/android/javalanguageserver.cpp
+++ b/src/plugins/android/javalanguageserver.cpp
@@ -143,7 +143,7 @@ QVariantMap JLSSettings::toMap() const
     return map;
 }
 
-void JLSSettings::fromMap(const QVariantMap &map)
+void JLSSettings::fromMap(const Storage &map)
 {
     StdIOSettings::fromMap(map);
     m_languageServer = FilePath::fromSettings(map[languageServerKey]);
diff --git a/src/plugins/android/javalanguageserver.h b/src/plugins/android/javalanguageserver.h
index 50e3fc72222..982ab566d0b 100644
--- a/src/plugins/android/javalanguageserver.h
+++ b/src/plugins/android/javalanguageserver.h
@@ -16,8 +16,8 @@ public:
     bool applyFromSettingsWidget(QWidget *widget) final;
     QWidget *createSettingsWidget(QWidget *parent) const final;
     bool isValid() const final;
-    QVariantMap toMap() const final;
-    void fromMap(const QVariantMap &map) final;
+    Utils::Storage toMap() const final;
+    void fromMap(const Utils::Storage &map) final;
     LanguageClient::BaseSettings *copy() const final;
     LanguageClient::Client *createClient(LanguageClient::BaseClientInterface *interface) const final;
     LanguageClient::BaseClientInterface *createInterface(
diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp
index dac0db19377..ecfd2dc54dd 100644
--- a/src/plugins/autotest/testrunner.cpp
+++ b/src/plugins/autotest/testrunner.cpp
@@ -446,7 +446,7 @@ void TestRunner::runTestsHelper()
         };
         const Group group {
             finishAllAndDone,
-            Storage(storage),
+            Tasking::Storage(storage),
             onGroupSetup(onSetup),
             ProcessTask(onProcessSetup, onProcessDone, onProcessDone)
         };
diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp
index d7754ebc9a0..4c72d51ac93 100644
--- a/src/plugins/baremetal/baremetaldevice.cpp
+++ b/src/plugins/baremetal/baremetaldevice.cpp
@@ -14,6 +14,7 @@
 #include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace BareMetal::Internal {
 
@@ -62,7 +63,7 @@ void BareMetalDevice::unregisterDebugServerProvider(IDebugServerProvider *provid
         m_debugServerProviderId.clear();
 }
 
-void BareMetalDevice::fromMap(const QVariantMap &map)
+void BareMetalDevice::fromMap(const Storage &map)
 {
     IDevice::fromMap(map);
     QString providerId = map.value(debugServerProviderIdKeyC).toString();
diff --git a/src/plugins/baremetal/baremetaldevice.h b/src/plugins/baremetal/baremetaldevice.h
index 662f24c08bc..096e9f17dee 100644
--- a/src/plugins/baremetal/baremetaldevice.h
+++ b/src/plugins/baremetal/baremetaldevice.h
@@ -31,8 +31,8 @@ public:
     void unregisterDebugServerProvider(IDebugServerProvider *provider);
 
 protected:
-    void fromMap(const QVariantMap &map) final;
-    QVariantMap toMap() const final;
+    void fromMap(const Utils::Storage &map) final;
+    Utils::Storage toMap() const final;
 
 private:
     BareMetalDevice();
diff --git a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp
index 202ddcd77c9..1054a76d29e 100644
--- a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp
@@ -74,8 +74,8 @@ private:
 class EBlinkGdbServerProvider final : public GdbServerProvider
 {
 public:
-    void toMap(QVariantMap &data) const final;
-    void fromMap(const QVariantMap &data) final;
+    void toMap(Storage &data) const final;
+    void fromMap(const Storage &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
 
@@ -215,7 +215,7 @@ bool EBlinkGdbServerProvider::isValid() const
     }
 }
 
-void EBlinkGdbServerProvider::toMap(QVariantMap &data) const
+void EBlinkGdbServerProvider::toMap(Storage &data) const
 {
     GdbServerProvider::toMap(data);
     data.insert(executableFileKeyC, m_executableFile.toSettings());
@@ -231,7 +231,7 @@ void EBlinkGdbServerProvider::toMap(QVariantMap &data) const
     data.insert(gdbNotUseCacheC, m_gdbNotUseCache);
 }
 
-void EBlinkGdbServerProvider::fromMap(const QVariantMap &data)
+void EBlinkGdbServerProvider::fromMap(const Storage &data)
 {
     GdbServerProvider::fromMap(data);
     m_executableFile = FilePath::fromSettings(data.value(executableFileKeyC));
diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
index 802d691c689..abf6e319b94 100644
--- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp
@@ -120,7 +120,7 @@ bool GdbServerProvider::operator==(const IDebugServerProvider &other) const
             && m_useExtendedRemote == p->m_useExtendedRemote;
 }
 
-void GdbServerProvider::toMap(QVariantMap &data) const
+void GdbServerProvider::toMap(Storage &data) const
 {
     IDebugServerProvider::toMap(data);
     data.insert(startupModeKeyC, m_startupMode);
@@ -179,7 +179,7 @@ RunWorker *GdbServerProvider::targetRunner(RunControl *runControl) const
     return new GdbServerProviderRunner(runControl, command());
 }
 
-void GdbServerProvider::fromMap(const QVariantMap &data)
+void GdbServerProvider::fromMap(const Storage &data)
 {
     IDebugServerProvider::fromMap(data);
     m_startupMode = static_cast<StartupMode>(data.value(startupModeKeyC).toInt());
diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h
index d4aba6fd9be..073e0e212ea 100644
--- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h
+++ b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h
@@ -33,7 +33,7 @@ public:
 
     bool operator==(const IDebugServerProvider &other) const override;
 
-    void toMap(QVariantMap &data) const override;
+    void toMap(Utils::Storage &data) const override;
 
     virtual Utils::CommandLine command() const;
 
@@ -55,7 +55,7 @@ protected:
     void setResetCommands(const QString &);
     void setUseExtendedRemote(bool);
 
-    void fromMap(const QVariantMap &data) override;
+    void fromMap(const Utils::Storage &data) override;
 
     StartupMode m_startupMode = StartupOnNetwork;
     Utils::FilePath m_peripheralDescriptionFile;
diff --git a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp
index e046a8244e6..32e3eabb6d1 100644
--- a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp
@@ -81,8 +81,8 @@ private:
 class JLinkGdbServerProvider final : public GdbServerProvider
 {
 public:
-    void toMap(QVariantMap &data) const final;
-    void fromMap(const QVariantMap &data) final;
+    void toMap(Storage &data) const final;
+    void fromMap(const Storage &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
 
@@ -194,7 +194,7 @@ bool JLinkGdbServerProvider::isValid() const
     return true;
 }
 
-void JLinkGdbServerProvider::toMap(QVariantMap &data) const
+void JLinkGdbServerProvider::toMap(Storage &data) const
 {
     GdbServerProvider::toMap(data);
     data.insert(executableFileKeyC, m_executableFile.toSettings());
@@ -206,7 +206,7 @@ void JLinkGdbServerProvider::toMap(QVariantMap &data) const
     data.insert(additionalArgumentsKeyC, m_additionalArguments);
 }
 
-void JLinkGdbServerProvider::fromMap(const QVariantMap &data)
+void JLinkGdbServerProvider::fromMap(const Storage &data)
 {
     GdbServerProvider::fromMap(data);
     m_executableFile = FilePath::fromSettings(data.value(executableFileKeyC));
diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp
index 5299ac6121e..2c5eb447d99 100644
--- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp
@@ -57,8 +57,8 @@ private:
 class OpenOcdGdbServerProvider final : public GdbServerProvider
 {
 public:
-    void toMap(QVariantMap &data) const final;
-    void fromMap(const QVariantMap &data) final;
+    void toMap(Storage &data) const final;
+    void fromMap(const Storage &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
 
@@ -180,7 +180,7 @@ bool OpenOcdGdbServerProvider::isValid() const
     return true;
 }
 
-void OpenOcdGdbServerProvider::toMap(QVariantMap &data) const
+void OpenOcdGdbServerProvider::toMap(Storage &data) const
 {
     GdbServerProvider::toMap(data);
     data.insert(executableFileKeyC, m_executableFile.toSettings());
@@ -189,7 +189,7 @@ void OpenOcdGdbServerProvider::toMap(QVariantMap &data) const
     data.insert(additionalArgumentsKeyC, m_additionalArguments);
 }
 
-void OpenOcdGdbServerProvider::fromMap(const QVariantMap &data)
+void OpenOcdGdbServerProvider::fromMap(const Storage &data)
 {
     GdbServerProvider::fromMap(data);
     m_executableFile = FilePath::fromSettings(data.value(executableFileKeyC));
diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
index 72b5bc3708a..d8d3ff1b0d0 100644
--- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp
@@ -67,8 +67,8 @@ private:
 class StLinkUtilGdbServerProvider final : public GdbServerProvider
 {
 public:
-    void toMap(QVariantMap &data) const final;
-    void fromMap(const QVariantMap &data) final;
+    void toMap(Storage &data) const final;
+    void fromMap(const Storage &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
 
@@ -177,7 +177,7 @@ bool StLinkUtilGdbServerProvider::isValid() const
     return true;
 }
 
-void StLinkUtilGdbServerProvider::toMap(QVariantMap &data) const
+void StLinkUtilGdbServerProvider::toMap(Storage &data) const
 {
     GdbServerProvider::toMap(data);
     data.insert(executableFileKeyC, m_executableFile.toSettings());
@@ -188,7 +188,7 @@ void StLinkUtilGdbServerProvider::toMap(QVariantMap &data) const
     data.insert(connectUnderResetKeyC, m_connectUnderReset);
 }
 
-void StLinkUtilGdbServerProvider::fromMap(const QVariantMap &data)
+void StLinkUtilGdbServerProvider::fromMap(const Storage &data)
 {
     GdbServerProvider::fromMap(data);
     m_executableFile = FilePath::fromSettings(data.value(executableFileKeyC));
diff --git a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp
index 256f95be986..ebf1ea3a021 100644
--- a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp
@@ -46,7 +46,7 @@ public:
     Speed speed = Speed::Speed_1MHz;
 
     QVariantMap toMap() const;
-    bool fromMap(const QVariantMap &data);
+    bool fromMap(const Storage &data);
     bool operator==(const JLinkUvscAdapterOptions &other) const;
 };
 
@@ -130,7 +130,7 @@ QVariantMap JLinkUvscAdapterOptions::toMap() const
     return map;
 }
 
-bool JLinkUvscAdapterOptions::fromMap(const QVariantMap &data)
+bool JLinkUvscAdapterOptions::fromMap(const Storage &data)
 {
     port = static_cast<Port>(data.value(adapterPortKeyC, SWD).toInt());
     speed = static_cast<Speed>(data.value(adapterSpeedKeyC, Speed_1MHz).toInt());
@@ -147,8 +147,8 @@ bool JLinkUvscAdapterOptions::operator==(const JLinkUvscAdapterOptions &other) c
 class JLinkUvscServerProvider final : public UvscServerProvider
 {
 public:
-    void toMap(QVariantMap &data) const final;
-    void fromMap(const QVariantMap &data) final;
+    void toMap(Storage &data) const final;
+    void fromMap(const Storage &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
     Utils::FilePath optionsFilePath(Debugger::DebuggerRunTool *runTool,
@@ -240,13 +240,13 @@ JLinkUvscServerProvider::JLinkUvscServerProvider()
     setSupportedDrivers({"Segger\\JL2CM3.dll"});
 }
 
-void JLinkUvscServerProvider::toMap(QVariantMap &data) const
+void JLinkUvscServerProvider::toMap(Storage &data) const
 {
     UvscServerProvider::toMap(data);
     data.insert(adapterOptionsKeyC, m_adapterOpts.toMap());
 }
 
-void JLinkUvscServerProvider::fromMap(const QVariantMap &data)
+void JLinkUvscServerProvider::fromMap(const Storage &data)
 {
     UvscServerProvider::fromMap(data);
     m_adapterOpts.fromMap(data.value(adapterOptionsKeyC).toMap());
diff --git a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp
index 7f3824ccb80..764c682f87e 100644
--- a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp
@@ -63,13 +63,13 @@ SimulatorUvscServerProvider::SimulatorUvscServerProvider()
     setDriverSelection(defaultSimulatorDriverSelection());
 }
 
-void SimulatorUvscServerProvider::toMap(QVariantMap &data) const
+void SimulatorUvscServerProvider::toMap(Storage &data) const
 {
     UvscServerProvider::toMap(data);
     data.insert(limitSpeedKeyC, m_limitSpeed);
 }
 
-void SimulatorUvscServerProvider::fromMap(const QVariantMap &data)
+void SimulatorUvscServerProvider::fromMap(const Storage &data)
 {
     UvscServerProvider::fromMap(data);
     m_limitSpeed = data.value(limitSpeedKeyC).toBool();
diff --git a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.h
index 96305b06a21..5e1e918c305 100644
--- a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.h
+++ b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.h
@@ -16,8 +16,8 @@ namespace BareMetal::Internal {
 class SimulatorUvscServerProvider final : public UvscServerProvider
 {
 public:
-    void toMap(QVariantMap &data) const final;
-    void fromMap(const QVariantMap &data) final;
+    void toMap(Utils::Storage &data) const final;
+    void fromMap(const Utils::Storage &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
     bool isSimulator() const final { return true; }
diff --git a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp
index e41fa381b60..164900adf0d 100644
--- a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp
@@ -51,7 +51,7 @@ public:
     Speed speed = Speed::Speed_4MHz;
 
     QVariantMap toMap() const;
-    bool fromMap(const QVariantMap &data);
+    bool fromMap(const Storage &data);
     bool operator==(const StLinkUvscAdapterOptions &other) const;
 };
 
@@ -86,8 +86,8 @@ static QString buildDllRegistryName(const DeviceSelection &device,
 class StLinkUvscServerProvider final : public UvscServerProvider
 {
 public:
-    void toMap(QVariantMap &data) const final;
-    void fromMap(const QVariantMap &data) final;
+    void toMap(Storage &data) const final;
+    void fromMap(const Storage &data) final;
 
     bool operator==(const IDebugServerProvider &other) const final;
     Utils::FilePath optionsFilePath(Debugger::DebuggerRunTool *runTool,
@@ -134,7 +134,7 @@ QVariantMap StLinkUvscAdapterOptions::toMap() const
     return map;
 }
 
-bool StLinkUvscAdapterOptions::fromMap(const QVariantMap &data)
+bool StLinkUvscAdapterOptions::fromMap(const Storage &data)
 {
     port = static_cast<Port>(data.value(adapterPortKeyC, SWD).toInt());
     speed = static_cast<Speed>(data.value(adapterSpeedKeyC, Speed_4MHz).toInt());
@@ -200,13 +200,13 @@ StLinkUvscServerProvider::StLinkUvscServerProvider()
     setSupportedDrivers({"STLink\\ST-LINKIII-KEIL_SWO.dll"});
 }
 
-void StLinkUvscServerProvider::toMap(QVariantMap &data) const
+void StLinkUvscServerProvider::toMap(Storage &data) const
 {
     UvscServerProvider::toMap(data);
     data.insert(adapterOptionsKeyC, m_adapterOpts.toMap());
 }
 
-void StLinkUvscServerProvider::fromMap(const QVariantMap &data)
+void StLinkUvscServerProvider::fromMap(const Storage &data)
 {
     UvscServerProvider::fromMap(data);
     m_adapterOpts.fromMap(data.value(adapterOptionsKeyC).toMap());
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
index 9b20bea548f..3a360e7582a 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp
@@ -147,7 +147,7 @@ FilePath UvscServerProvider::buildOptionsFilePath(DebuggerRunTool *runTool) cons
     return path;
 }
 
-void UvscServerProvider::toMap(QVariantMap &data) const
+void UvscServerProvider::toMap(Storage &data) const
 {
     IDebugServerProvider::toMap(data);
     data.insert(toolsIniKeyC, m_toolsIniFile.toSettings());
@@ -219,7 +219,7 @@ ProjectExplorer::RunWorker *UvscServerProvider::targetRunner(RunControl *runCont
     return new UvscServerProviderRunner(runControl, r);
 }
 
-void UvscServerProvider::fromMap(const QVariantMap &data)
+void UvscServerProvider::fromMap(const Storage &data)
 {
     IDebugServerProvider::fromMap(data);
     m_toolsIniFile = FilePath::fromSettings(data.value(toolsIniKeyC));
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h
index 82988965ed8..d16ecb7f915 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h
+++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h
@@ -48,7 +48,7 @@ public:
 
     bool operator==(const IDebugServerProvider &other) const override;
 
-    void toMap(QVariantMap &map) const override;
+    void toMap(Utils::Storage &map) const override;
 
     bool aboutToRun(Debugger::DebuggerRunTool *runTool, QString &errorMessage) const final;
     ProjectExplorer::RunWorker *targetRunner(ProjectExplorer::RunControl *runControl) const final;
@@ -69,7 +69,7 @@ protected:
     Utils::FilePath buildProjectFilePath(Debugger::DebuggerRunTool *runTool) const;
     Utils::FilePath buildOptionsFilePath(Debugger::DebuggerRunTool *runTool) const;
 
-    void fromMap(const QVariantMap &data) override;
+    void fromMap(const Utils::Storage &data) override;
 
     // uVision specific stuff.
     virtual Utils::FilePath projectFilePath(Debugger::DebuggerRunTool *runTool,
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp
index b41f835c7b5..e165561c7dd 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp
@@ -102,7 +102,7 @@ QVariantMap DeviceSelection::toMap() const
     return map;
 }
 
-void DeviceSelection::fromMap(const QVariantMap &map)
+void DeviceSelection::fromMap(const Storage &map)
 {
     // Software package.
     package.desc = map.value(packageDescrKeyC).toString();
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.h b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.h
index cee1876f6d8..abfb8d7b49d 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.h
+++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.h
@@ -5,6 +5,7 @@
 
 #include <utils/basetreeview.h>
 #include <utils/treemodel.h>
+#include <utils/storage.h>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
@@ -71,8 +72,8 @@ public:
     Algorithms algorithms;
     int algorithmIndex = 0;
 
-    QVariantMap toMap() const;
-    void fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    void fromMap(const Utils::Storage &map);
     bool operator==(const DeviceSelection &other) const;
 };
 
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp
index 5b403737f0a..6c6a41955d5 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp
@@ -33,7 +33,7 @@ QVariantMap DriverSelection::toMap() const
     return map;
 }
 
-void DriverSelection::fromMap(const QVariantMap &map)
+void DriverSelection::fromMap(const Storage &map)
 {
     index = map.value(driverIndexKeyC).toInt();
     cpuDllIndex = map.value(driverCpuDllIndexKeyC).toInt();
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.h b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.h
index 65bcd52d80d..11a66c2dcb9 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.h
+++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.h
@@ -5,6 +5,7 @@
 
 #include <utils/basetreeview.h>
 #include <utils/treemodel.h>
+#include <utils/storage.h>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
@@ -23,8 +24,8 @@ public:
     int index = 0;
     int cpuDllIndex = 0;
 
-    QVariantMap toMap() const;
-    void fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    void fromMap(const Utils::Storage &map);
 
     bool operator==(const DriverSelection &other) const;
 };
diff --git a/src/plugins/baremetal/idebugserverprovider.cpp b/src/plugins/baremetal/idebugserverprovider.cpp
index 6bf5ea8cb6e..03ddc183c43 100644
--- a/src/plugins/baremetal/idebugserverprovider.cpp
+++ b/src/plugins/baremetal/idebugserverprovider.cpp
@@ -18,6 +18,7 @@
 
 using namespace Debugger;
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace BareMetal::Internal {
 
@@ -137,7 +138,7 @@ IDebugServerProviderConfigWidget *IDebugServerProvider::configurationWidget() co
     return m_configurationWidgetCreator();
 }
 
-void IDebugServerProvider::toMap(QVariantMap &data) const
+void IDebugServerProvider::toMap(Storage &data) const
 {
     data.insert(idKeyC, m_id);
     data.insert(displayNameKeyC, m_displayName);
@@ -166,7 +167,7 @@ void IDebugServerProvider::resetId()
     m_id = createId(m_id);
 }
 
-void IDebugServerProvider::fromMap(const QVariantMap &data)
+void IDebugServerProvider::fromMap(const Storage &data)
 {
     m_id = data.value(idKeyC).toString();
     m_displayName = data.value(displayNameKeyC).toString();
diff --git a/src/plugins/baremetal/idebugserverprovider.h b/src/plugins/baremetal/idebugserverprovider.h
index c28e8c50d8a..846be8ed893 100644
--- a/src/plugins/baremetal/idebugserverprovider.h
+++ b/src/plugins/baremetal/idebugserverprovider.h
@@ -4,12 +4,14 @@
 #pragma once
 
 #include <debugger/debuggerconstants.h>
+
 #include <projectexplorer/abi.h>
-#include <utils/fileutils.h>
 
-#include <QObject>
+#include <utils/filepath.h>
+#include <utils/storage.h>
+
 #include <QSet>
-#include <QVariantMap>
+#include <QUrl>
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
@@ -65,8 +67,8 @@ public:
     void setConfigurationWidgetCreator
         (const std::function<IDebugServerProviderConfigWidget *()> &configurationWidgetCreator);
 
-    virtual void toMap(QVariantMap &data) const;
-    virtual void fromMap(const QVariantMap &data);
+    virtual void toMap(Utils::Storage &data) const;
+    virtual void fromMap(const Utils::Storage &data);
 
     virtual bool aboutToRun(Debugger::DebuggerRunTool *runTool,
                             QString &errorMessage) const = 0;
diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp
index 43783279d69..6fdd610d96b 100644
--- a/src/plugins/boot2qt/qdbdevice.cpp
+++ b/src/plugins/boot2qt/qdbdevice.cpp
@@ -137,7 +137,7 @@ QString QdbDevice::serialNumber() const
     return m_serialNumber;
 }
 
-void QdbDevice::fromMap(const QVariantMap &map)
+void QdbDevice::fromMap(const Storage &map)
 {
     ProjectExplorer::IDevice::fromMap(map);
     setSerialNumber(map.value("Qdb.SerialNumber").toString());
diff --git a/src/plugins/boot2qt/qdbdevice.h b/src/plugins/boot2qt/qdbdevice.h
index 300fe826329..e0ccac65557 100644
--- a/src/plugins/boot2qt/qdbdevice.h
+++ b/src/plugins/boot2qt/qdbdevice.h
@@ -26,8 +26,8 @@ public:
     void setupDefaultNetworkSettings(const QString &host);
 
 protected:
-    void fromMap(const QVariantMap &map) final;
-    QVariantMap toMap() const final;
+    void fromMap(const Utils::Storage &map) final;
+    Utils::Storage toMap() const final;
 
 private:
     QdbDevice();
diff --git a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp
index f783a98499a..c3e9c42903f 100644
--- a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp
+++ b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp
@@ -192,7 +192,7 @@ LocatorMatcherTask currentDocumentMatcher()
     };
 
     const Group root {
-        Storage(resultStorage),
+        Tasking::Storage(resultStorage),
         CurrentDocumentSymbolsRequestTask(onQuerySetup, onQueryDone),
         AsyncTask<void>(onFilterSetup)
     };
diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp
index aaea55d08c3..6fc8d3f06fb 100644
--- a/src/plugins/clangtools/clangtool.cpp
+++ b/src/plugins/clangtools/clangtool.cpp
@@ -813,7 +813,7 @@ Group ClangTool::runRecipe(const RunSettings &runSettings,
                                   NormalMessageFormat);
     };
 
-    topTasks.append(Group { Storage(storage), TaskTreeTask(onTreeSetup, onTreeDone) });
+    topTasks.append(Group { Tasking::Storage(storage), TaskTreeTask(onTreeSetup, onTreeDone) });
     return {topTasks};
 }
 
diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp
index ecace1c7d36..20331566410 100644
--- a/src/plugins/clangtools/clangtoolrunner.cpp
+++ b/src/plugins/clangtools/clangtoolrunner.cpp
@@ -219,7 +219,7 @@ GroupItem clangToolTask(const AnalyzeInputData &input,
 
     const Group group {
         finishAllAndDone,
-        Storage(storage),
+        Tasking::Storage(storage),
         onGroupSetup(onSetup),
         Group {
             sequential,
diff --git a/src/plugins/clangtools/clangtoolssettings.cpp b/src/plugins/clangtools/clangtoolssettings.cpp
index 440bde4ecc6..6661a3b50cb 100644
--- a/src/plugins/clangtools/clangtoolssettings.cpp
+++ b/src/plugins/clangtools/clangtoolssettings.cpp
@@ -41,7 +41,7 @@ RunSettings::RunSettings()
 {
 }
 
-void RunSettings::fromMap(const QVariantMap &map, const QString &prefix)
+void RunSettings::fromMap(const Storage &map, const QString &prefix)
 {
     m_diagnosticConfigId = Id::fromSetting(map.value(prefix + diagnosticConfigIdKey));
     m_parallelJobs = map.value(prefix + parallelJobsKey).toInt();
@@ -50,7 +50,7 @@ void RunSettings::fromMap(const QVariantMap &map, const QString &prefix)
     m_analyzeOpenFiles = map.value(prefix + analyzeOpenFilesKey).toBool();
 }
 
-void RunSettings::toMap(QVariantMap &map, const QString &prefix) const
+void RunSettings::toMap(Storage &map, const QString &prefix) const
 {
     map.insert(prefix + diagnosticConfigIdKey, m_diagnosticConfigId.toSetting());
     map.insert(prefix + parallelJobsKey, m_parallelJobs);
diff --git a/src/plugins/clangtools/clangtoolssettings.h b/src/plugins/clangtools/clangtoolssettings.h
index 920a185d7df..885674baba2 100644
--- a/src/plugins/clangtools/clangtoolssettings.h
+++ b/src/plugins/clangtools/clangtoolssettings.h
@@ -26,8 +26,8 @@ class RunSettings
 public:
     RunSettings();
 
-    void fromMap(const QVariantMap &map, const QString &prefix = QString());
-    void toMap(QVariantMap &map, const QString &prefix = QString()) const;
+    void fromMap(const Utils::Storage &map, const QString &prefix = QString());
+    void toMap(Utils::Storage &map, const QString &prefix = QString()) const;
 
     Utils::Id diagnosticConfigId() const;
     void setDiagnosticConfigId(const Utils::Id &id) { m_diagnosticConfigId = id; }
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index a6be87fd968..9a6383e552a 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -2139,14 +2139,14 @@ void InitialCMakeArgumentsAspect::setCMakeConfiguration(const CMakeConfig &confi
         ci.isInitial = true;
 }
 
-void InitialCMakeArgumentsAspect::fromMap(const QVariantMap &map)
+void InitialCMakeArgumentsAspect::fromMap(const Storage &map)
 {
     const QString value = map.value(settingsKey(), defaultValue()).toString();
     QStringList additionalArguments;
     setAllValues(value, additionalArguments);
 }
 
-void InitialCMakeArgumentsAspect::toMap(QVariantMap &map) const
+void InitialCMakeArgumentsAspect::toMap(Storage &map) const
 {
     saveToMap(map, allValues().join('\n'), defaultValue(), settingsKey());
 }
@@ -2231,7 +2231,7 @@ ConfigureEnvironmentAspect::ConfigureEnvironmentAspect(AspectContainer *containe
     });
 }
 
-void ConfigureEnvironmentAspect::fromMap(const QVariantMap &map)
+void ConfigureEnvironmentAspect::fromMap(const Storage &map)
 {
     // Match the key values from Qt Creator 9.0.0/1 to the ones from EnvironmentAspect
     const bool cleanSystemEnvironment = map.value(QLatin1String(CLEAR_SYSTEM_ENVIRONMENT_KEY))
@@ -2249,7 +2249,7 @@ void ConfigureEnvironmentAspect::fromMap(const QVariantMap &map)
     ProjectExplorer::EnvironmentAspect::fromMap(tmpMap);
 }
 
-void ConfigureEnvironmentAspect::toMap(QVariantMap &map) const
+void ConfigureEnvironmentAspect::toMap(Storage &map) const
 {
     QVariantMap tmpMap;
     ProjectExplorer::EnvironmentAspect::toMap(tmpMap);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
index 4fe1fb6c6bc..e7df5d05b35 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
@@ -31,8 +31,8 @@ public:
     void setAllValues(const QString &values, QStringList &additionalArguments);
     void setCMakeConfiguration(const CMakeConfig &config);
 
-    void fromMap(const QVariantMap &map) final;
-    void toMap(QVariantMap &map) const final;
+    void fromMap(const Utils::Storage &map) final;
+    void toMap(Utils::Storage &map) const final;
 
 private:
     CMakeConfig m_cmakeConfiguration;
@@ -44,8 +44,8 @@ public:
     ConfigureEnvironmentAspect(Utils::AspectContainer *container,
                                ProjectExplorer::BuildConfiguration *buildConfig);
 
-    void fromMap(const QVariantMap &map);
-    void toMap(QVariantMap &map) const;
+    void fromMap(const Utils::Storage &map);
+    void toMap(Utils::Storage &map) const;
 };
 
 } // namespace Internal
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index bff01796157..3fd1066468e 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -273,7 +273,7 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) :
             this, &CMakeBuildStep::updateBuildTargetsModel);
 }
 
-void CMakeBuildStep::toMap(QVariantMap &map) const
+void CMakeBuildStep::toMap(Utils::Storage &map) const
 {
     CMakeAbstractProcessStep::toMap(map);
     map.insert(BUILD_TARGETS_KEY, m_buildTargets);
@@ -282,7 +282,7 @@ void CMakeBuildStep::toMap(QVariantMap &map) const
     map.insert(QLatin1String(BUILD_PRESET_KEY), m_buildPreset);
 }
 
-void CMakeBuildStep::fromMap(const QVariantMap &map)
+void CMakeBuildStep::fromMap(const Utils::Storage &map)
 {
     setBuildTargets(map.value(BUILD_TARGETS_KEY).toStringList());
 
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
index f808b342de1..a202708a070 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
@@ -44,7 +44,7 @@ public:
     bool buildsBuildTarget(const QString &target) const;
     void setBuildsBuildTarget(const QString &target, bool on);
 
-    void toMap(QVariantMap &map) const override;
+    void toMap(Utils::Storage &map) const override;
 
     QString cleanTarget() const;
     QString allTarget() const ;
@@ -83,7 +83,7 @@ signals:
 private:
     Utils::CommandLine cmakeCommand() const;
 
-    void fromMap(const QVariantMap &map) override;
+    void fromMap(const Utils::Storage &map) override;
 
     bool init() override;
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.h b/src/plugins/cmakeprojectmanager/cmaketool.h
index 31b9e016276..744a34f2fb4 100644
--- a/src/plugins/cmakeprojectmanager/cmaketool.h
+++ b/src/plugins/cmakeprojectmanager/cmaketool.h
@@ -7,8 +7,9 @@
 
 #include <texteditor/codeassist/keywordscompletionassist.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
+#include <utils/storage.h>
 
 #include <optional>
 
@@ -59,7 +60,7 @@ public:
     bool isValid() const;
 
     Utils::Id id() const { return m_id; }
-    QVariantMap toMap () const;
+    Utils::Storage toMap () const;
 
     void setAutorun(bool autoRun) { m_isAutoRun = autoRun; }
 
diff --git a/src/plugins/cppeditor/cppcodemodelsettings.cpp b/src/plugins/cppeditor/cppcodemodelsettings.cpp
index 7a32011cf54..239a5a8e1b1 100644
--- a/src/plugins/cppeditor/cppcodemodelsettings.cpp
+++ b/src/plugins/cppeditor/cppcodemodelsettings.cpp
@@ -558,7 +558,7 @@ QVariantMap ClangdSettings::Data::toMap() const
     return map;
 }
 
-void ClangdSettings::Data::fromMap(const QVariantMap &map)
+void ClangdSettings::Data::fromMap(const Storage &map)
 {
     useClangd = map.value(useClangdKey(), true).toBool();
     executableFilePath = FilePath::fromString(map.value(clangdPathKey()).toString());
diff --git a/src/plugins/cppeditor/cppcodemodelsettings.h b/src/plugins/cppeditor/cppcodemodelsettings.h
index c22fb88faa5..c35ca854221 100644
--- a/src/plugins/cppeditor/cppcodemodelsettings.h
+++ b/src/plugins/cppeditor/cppcodemodelsettings.h
@@ -7,8 +7,9 @@
 #include "cppeditor_global.h"
 
 #include <utils/clangutils.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
+#include <utils/storage.h>
 
 #include <QObject>
 #include <QStringList>
@@ -93,8 +94,8 @@ public:
     class CPPEDITOR_EXPORT Data
     {
     public:
-        QVariantMap toMap() const;
-        void fromMap(const QVariantMap &map);
+        Utils::Storage toMap() const;
+        void fromMap(const Utils::Storage &map);
 
         friend bool operator==(const Data &s1, const Data &s2)
         {
diff --git a/src/plugins/cppeditor/cppcodestylepreferences.cpp b/src/plugins/cppeditor/cppcodestylepreferences.cpp
index b09537bc72c..27271edcfa0 100644
--- a/src/plugins/cppeditor/cppcodestylepreferences.cpp
+++ b/src/plugins/cppeditor/cppcodestylepreferences.cpp
@@ -3,6 +3,8 @@
 
 #include "cppcodestylepreferences.h"
 
+using namespace Utils;
+
 namespace CppEditor {
 
 CppCodeStylePreferences::CppCodeStylePreferences(QObject *parent) :
@@ -78,7 +80,7 @@ QVariantMap CppCodeStylePreferences::toMap() const
     return map;
 }
 
-void CppCodeStylePreferences::fromMap(const QVariantMap &map)
+void CppCodeStylePreferences::fromMap(const Storage &map)
 {
     ICodeStylePreferences::fromMap(map);
     if (!currentDelegate())
diff --git a/src/plugins/cppeditor/cppcodestylepreferences.h b/src/plugins/cppeditor/cppcodestylepreferences.h
index e496de7c6b4..2d10ace3bbd 100644
--- a/src/plugins/cppeditor/cppcodestylepreferences.h
+++ b/src/plugins/cppeditor/cppcodestylepreferences.h
@@ -25,8 +25,8 @@ public:
     // tracks parent hierarchy until currentParentSettings is null
     CppCodeStyleSettings currentCodeStyleSettings() const;
 
-    QVariantMap toMap() const override;
-    void fromMap(const QVariantMap &map) override;
+    Utils::Storage toMap() const override;
+    void fromMap(const Utils::Storage &map) override;
 
 public slots:
     void setCodeStyleSettings(const CppCodeStyleSettings &data);
diff --git a/src/plugins/cppeditor/cppcodestylesettings.cpp b/src/plugins/cppeditor/cppcodestylesettings.cpp
index 0607ce52819..33dd4617f8b 100644
--- a/src/plugins/cppeditor/cppcodestylesettings.cpp
+++ b/src/plugins/cppeditor/cppcodestylesettings.cpp
@@ -40,6 +40,8 @@ static const char extraPaddingForConditionsIfConfusingAlignKey[] = "ExtraPadding
 static const char alignAssignmentsKey[] = "AlignAssignments";
 static const char shortGetterNameKey[] = "ShortGetterName";
 
+using namespace Utils;
+
 namespace CppEditor {
 
 // ------------------ CppCodeStyleSettingsWidget
@@ -73,7 +75,7 @@ QVariantMap CppCodeStyleSettings::toMap() const
     };
 }
 
-void CppCodeStyleSettings::fromMap(const QVariantMap &map)
+void CppCodeStyleSettings::fromMap(const Storage &map)
 {
     indentBlockBraces = map.value(indentBlockBracesKey, indentBlockBraces).toBool();
     indentBlockBody = map.value(indentBlockBodyKey, indentBlockBody).toBool();
diff --git a/src/plugins/cppeditor/cppcodestylesettings.h b/src/plugins/cppeditor/cppcodestylesettings.h
index 74de7df83af..38041ccbb3d 100644
--- a/src/plugins/cppeditor/cppcodestylesettings.h
+++ b/src/plugins/cppeditor/cppcodestylesettings.h
@@ -5,9 +5,7 @@
 
 #include "cppeditor_global.h"
 
-#include <QVariantMap>
-
-#include <optional>
+#include <utils/storage.h>
 
 namespace CPlusPlus { class Overview; }
 namespace TextEditor { class TabSettings; }
@@ -66,8 +64,8 @@ public:
     bool forceFormatting = false;
 #endif
 
-    QVariantMap toMap() const;
-    void fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    void fromMap(const Utils::Storage &map);
 
     bool equals(const CppCodeStyleSettings &rhs) const;
     bool operator==(const CppCodeStyleSettings &s) const { return equals(s); }
diff --git a/src/plugins/cppeditor/cppprojectupdater.cpp b/src/plugins/cppeditor/cppprojectupdater.cpp
index 4df4b5de4ae..c75ee0cb522 100644
--- a/src/plugins/cppeditor/cppprojectupdater.cpp
+++ b/src/plugins/cppeditor/cppprojectupdater.cpp
@@ -90,7 +90,7 @@ void CppProjectUpdater::update(const ProjectUpdateInfo &projectUpdateInfo,
     };
 
     const Group root {
-        Storage(storage),
+        Tasking::Storage(storage),
         Group(tasks),
         onGroupDone(onDone),
         onGroupError(onError)
diff --git a/src/plugins/debugger/commonoptionspage.h b/src/plugins/debugger/commonoptionspage.h
index 6b890b53a56..21a29fdf700 100644
--- a/src/plugins/debugger/commonoptionspage.h
+++ b/src/plugins/debugger/commonoptionspage.h
@@ -22,8 +22,8 @@ public:
     explicit SourcePathMapAspect(Utils::AspectContainer *container);
     ~SourcePathMapAspect() override;
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     void addToLayout(Layouting::LayoutItem &parent) override;
 
diff --git a/src/plugins/debugger/debuggeritem.h b/src/plugins/debugger/debuggeritem.h
index 7341f759357..49d6798ff9e 100644
--- a/src/plugins/debugger/debuggeritem.h
+++ b/src/plugins/debugger/debuggeritem.h
@@ -10,10 +10,9 @@
 
 #include <utils/filepath.h>
 #include <utils/environment.h>
+#include <utils/storage.h>
 
 #include <QDateTime>
-#include <QList>
-#include <QVariant>
 
 namespace Debugger {
 
@@ -38,7 +37,7 @@ public:
     bool isValid() const;
     QString engineTypeName() const;
 
-    QVariantMap toMap() const;
+    Utils::Storage toMap() const;
 
     QVariant id() const { return m_id; }
 
diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
index 78ea55f2a19..89ce34190dd 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -211,7 +211,7 @@ int DebuggerRunConfigurationAspect::portsUsedByDebugger() const
     return ports;
 }
 
-void DebuggerRunConfigurationAspect::toMap(QVariantMap &map) const
+void DebuggerRunConfigurationAspect::toMap(Storage &map) const
 {
     m_cppAspect->toMap(map);
     m_qmlAspect->toMap(map);
@@ -223,7 +223,7 @@ void DebuggerRunConfigurationAspect::toMap(QVariantMap &map) const
     map.insert("RunConfiguration.UseQmlDebuggerAuto", m_qmlAspect->value() == TriState::Default);
 }
 
-void DebuggerRunConfigurationAspect::fromMap(const QVariantMap &map)
+void DebuggerRunConfigurationAspect::fromMap(const Storage &map)
 {
     m_cppAspect->fromMap(map);
     m_qmlAspect->fromMap(map);
diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.h b/src/plugins/debugger/debuggerrunconfigurationaspect.h
index 53b9c1f54d2..164f4d5eb28 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.h
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.h
@@ -17,8 +17,8 @@ public:
     DebuggerRunConfigurationAspect(ProjectExplorer::Target *target);
     ~DebuggerRunConfigurationAspect();
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     bool useCppDebugger() const;
     bool useQmlDebugger() const;
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
index c0ca4bb2f6b..8f74a24da5d 100644
--- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
+++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
@@ -452,12 +452,12 @@ SourcePathMapAspect::~SourcePathMapAspect()
     delete d;
 }
 
-void SourcePathMapAspect::fromMap(const QVariantMap &)
+void SourcePathMapAspect::fromMap(const Storage &)
 {
     QTC_CHECK(false); // This is only used via read/writeSettings
 }
 
-void SourcePathMapAspect::toMap(QVariantMap &) const
+void SourcePathMapAspect::toMap(Storage &) const
 {
     QTC_CHECK(false);
 }
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index bdb3a36d71e..63b1604f725 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -778,7 +778,7 @@ const char DockerDeviceKeepEntryPoint[] = "DockerDeviceKeepEntryPoint";
 const char DockerDeviceEnableLldbFlags[] = "DockerDeviceEnableLldbFlags";
 const char DockerDeviceClangDExecutable[] = "DockerDeviceClangDExecutable";
 
-void DockerDevice::fromMap(const QVariantMap &map)
+void DockerDevice::fromMap(const Storage &map)
 {
     ProjectExplorer::IDevice::fromMap(map);
     DockerDeviceData data;
diff --git a/src/plugins/docker/dockerdevice.h b/src/plugins/docker/dockerdevice.h
index 6e40b585372..045cc6943b7 100644
--- a/src/plugins/docker/dockerdevice.h
+++ b/src/plugins/docker/dockerdevice.h
@@ -99,8 +99,8 @@ public:
     std::optional<Utils::FilePath> clangdExecutable() const override;
 
 protected:
-    void fromMap(const QVariantMap &map) final;
-    QVariantMap toMap() const final;
+    void fromMap(const Utils::Storage &map) final;
+    Utils::Storage toMap() const final;
 
 private:
     void aboutToBeRemoved() const final;
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 1788997dc1e..8c10ac4777a 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -619,7 +619,7 @@ void GenericBuildSystem::removeFiles(const FilePaths &filesToRemove)
     }
 }
 
-Project::RestoreResult GenericProject::fromMap(const QVariantMap &map, QString *errorMessage)
+Project::RestoreResult GenericProject::fromMap(const Storage &map, QString *errorMessage)
 {
     const RestoreResult result = Project::fromMap(map, errorMessage);
     if (result != RestoreResult::Ok)
diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h
index a3848402244..40986ff660c 100644
--- a/src/plugins/genericprojectmanager/genericproject.h
+++ b/src/plugins/genericprojectmanager/genericproject.h
@@ -19,7 +19,7 @@ public:
     void removeFilesTriggered(const Utils::FilePaths &filesToRemove);
 
 private:
-    RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) final;
+    RestoreResult fromMap(const Utils::Storage &map, QString *errorMessage) final;
     ProjectExplorer::DeploymentKnowledge deploymentKnowledge() const final;
     void configureAsExampleProject(ProjectExplorer::Kit *kit) override;
 };
diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp
index 53804efdd9c..77d700147ae 100644
--- a/src/plugins/git/branchview.cpp
+++ b/src/plugins/git/branchview.cpp
@@ -560,7 +560,7 @@ TaskTree *BranchView::onFastForwardMerge(const std::function<void()> &callback)
         });
 
     const Group root {
-        Storage(storage),
+        Tasking::Storage(storage),
         parallel,
         ProcessTask(setupMergeBase, onMergeBaseDone),
         topRevisionProc,
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index bf568734667..be00253d826 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -248,7 +248,7 @@ GitDiffEditorController::GitDiffEditorController(IDocument *document,
     };
 
     const Group root {
-        Storage(diffInputStorage),
+        Tasking::Storage(diffInputStorage),
         ProcessTask(setupDiff, onDiffDone),
         postProcessTask(diffInputStorage)
     };
@@ -333,8 +333,8 @@ FileListDiffController::FileListDiffController(IDocument *document, const QStrin
     };
 
     const Group root {
-        Storage(storage),
-        Storage(diffInputStorage),
+        Tasking::Storage(storage),
+        Tasking::Storage(diffInputStorage),
         Group {
             parallel,
             continueOnDone,
@@ -529,8 +529,8 @@ ShowController::ShowController(IDocument *document, const QString &id)
     };
 
     const Group root {
-        Storage(storage),
-        Storage(diffInputStorage),
+        Tasking::Storage(storage),
+        Tasking::Storage(diffInputStorage),
         parallel,
         onGroupSetup([this] { setStartupFile(VcsBase::source(this->document()).toString()); }),
         Group {
diff --git a/src/plugins/incredibuild/commandbuilder.cpp b/src/plugins/incredibuild/commandbuilder.cpp
index 9febc343df0..73f9808a68f 100644
--- a/src/plugins/incredibuild/commandbuilder.cpp
+++ b/src/plugins/incredibuild/commandbuilder.cpp
@@ -17,7 +17,7 @@ QString CommandBuilder::displayName() const
     return Tr::tr("Custom Command");
 }
 
-void CommandBuilder::fromMap(const QVariantMap &map)
+void CommandBuilder::fromMap(const Storage &map)
 {
     m_command = FilePath::fromSettings(map.value(QString(CUSTOMCOMMANDBUILDER_COMMAND).arg(id())));
     m_args = map.value(QString(CUSTOMCOMMANDBUILDER_ARGS).arg(id())).toString();
diff --git a/src/plugins/incredibuild/commandbuilder.h b/src/plugins/incredibuild/commandbuilder.h
index 7d800e91b6a..024b64f55f1 100644
--- a/src/plugins/incredibuild/commandbuilder.h
+++ b/src/plugins/incredibuild/commandbuilder.h
@@ -20,7 +20,7 @@ public:
     virtual QString id() const { return "CustomCommandBuilder"; }
     virtual QString displayName() const;
 
-    virtual void fromMap(const QVariantMap &map);
+    virtual void fromMap(const Utils::Storage &map);
     virtual void toMap(QVariantMap *map) const;
 
     virtual Utils::FilePath defaultCommand() const { return {}; }
diff --git a/src/plugins/incredibuild/commandbuilderaspect.cpp b/src/plugins/incredibuild/commandbuilderaspect.cpp
index 3eced7c144f..750ec43f09c 100644
--- a/src/plugins/incredibuild/commandbuilderaspect.cpp
+++ b/src/plugins/incredibuild/commandbuilderaspect.cpp
@@ -159,7 +159,7 @@ void CommandBuilderAspect::addToLayout(Layouting::LayoutItem &parent)
     updateGui();
 }
 
-void CommandBuilderAspect::fromMap(const QVariantMap &map)
+void CommandBuilderAspect::fromMap(const Storage &map)
 {
     d->m_loadedFromMap = true;
 
@@ -171,7 +171,7 @@ void CommandBuilderAspect::fromMap(const QVariantMap &map)
     updateGui();
 }
 
-void CommandBuilderAspect::toMap(QVariantMap &map) const
+void CommandBuilderAspect::toMap(Storage &map) const
 {
     map[IncrediBuild::Constants::INCREDIBUILD_BUILDSTEP_TYPE]
             = QVariant(IncrediBuild::Constants::BUILDCONSOLE_BUILDSTEP_ID);
diff --git a/src/plugins/incredibuild/commandbuilderaspect.h b/src/plugins/incredibuild/commandbuilderaspect.h
index 6033e9036e5..f8fe6a9f055 100644
--- a/src/plugins/incredibuild/commandbuilderaspect.h
+++ b/src/plugins/incredibuild/commandbuilderaspect.h
@@ -24,8 +24,8 @@ public:
 
 private:
     void addToLayout(Layouting::LayoutItem &parent) final;
-    void fromMap(const QVariantMap &map) final;
-    void toMap(QVariantMap &map) const final;
+    void fromMap(const Utils::Storage &map) final;
+    void toMap(Utils::Storage &map) const final;
 
     void updateGui();
 
diff --git a/src/plugins/ios/iosbuildconfiguration.cpp b/src/plugins/ios/iosbuildconfiguration.cpp
index 1254115d666..4e98ccb7670 100644
--- a/src/plugins/ios/iosbuildconfiguration.cpp
+++ b/src/plugins/ios/iosbuildconfiguration.cpp
@@ -376,7 +376,7 @@ public:
 
 private:
     QList<NamedWidget *> createSubConfigWidgets() override;
-    void fromMap(const QVariantMap &map) override;
+    void fromMap(const Storage &map) override;
 
     void updateQmakeCommand();
 
@@ -414,7 +414,7 @@ QList<NamedWidget *> IosQmakeBuildConfiguration::createSubConfigWidgets()
     return subConfigWidgets;
 }
 
-void IosQmakeBuildConfiguration::fromMap(const QVariantMap &map)
+void IosQmakeBuildConfiguration::fromMap(const Storage &map)
 {
     QmakeBuildConfiguration::fromMap(map);
     if (!hasError())
diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp
index c017c77408c..2b7faa7f7f4 100644
--- a/src/plugins/ios/iosbuildstep.cpp
+++ b/src/plugins/ios/iosbuildstep.cpp
@@ -56,8 +56,8 @@ private:
 
     bool init() final;
     void setupOutputFormatter(Utils::OutputFormatter *formatter) final;
-    void fromMap(const QVariantMap &map) final;
-    void toMap(QVariantMap &map) const final;
+    void fromMap(const Storage &map) final;
+    void toMap(Storage &map) const final;
 
     QStringList m_baseBuildArguments;
     QStringList m_extraArguments;
@@ -166,7 +166,7 @@ void IosBuildStep::setupOutputFormatter(OutputFormatter *formatter)
     AbstractProcessStep::setupOutputFormatter(formatter);
 }
 
-void IosBuildStep::toMap(QVariantMap &map) const
+void IosBuildStep::toMap(Storage &map) const
 {
     AbstractProcessStep::toMap(map);
 
@@ -177,7 +177,7 @@ void IosBuildStep::toMap(QVariantMap &map) const
     map.insert(CLEAN_KEY, stepList()->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
 }
 
-void IosBuildStep::fromMap(const QVariantMap &map)
+void IosBuildStep::fromMap(const Storage &map)
 {
     QVariant bArgs = map.value(BUILD_ARGUMENTS_KEY);
     m_baseBuildArguments = bArgs.toStringList();
diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp
index b2cf10f5da3..5264c763a77 100644
--- a/src/plugins/ios/iosdevice.cpp
+++ b/src/plugins/ios/iosdevice.cpp
@@ -20,8 +20,6 @@
 #include <QFormLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <QVariant>
-#include <QVariantMap>
 
 #ifdef Q_OS_MAC
 #include <IOKit/IOKitLib.h>
@@ -42,6 +40,7 @@
 #include <exception>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace {
 static Q_LOGGING_CATEGORY(detectLog, "qtc.ios.deviceDetect", QtWarningMsg)
@@ -127,7 +126,7 @@ IDeviceWidget *IosDevice::createWidget()
     return new IosDeviceInfoWidget(sharedFromThis());
 }
 
-void IosDevice::fromMap(const QVariantMap &map)
+void IosDevice::fromMap(const Storage &map)
 {
     IDevice::fromMap(map);
 
diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h
index ada952037d9..6e5d6af9f36 100644
--- a/src/plugins/ios/iosdevice.h
+++ b/src/plugins/ios/iosdevice.h
@@ -40,8 +40,8 @@ public:
     static QString name();
 
 protected:
-    void fromMap(const QVariantMap &map) final;
-    QVariantMap toMap() const final;
+    void fromMap(const Utils::Storage &map) final;
+    Utils::Storage toMap() const final;
 
     friend class IosDeviceFactory;
     friend class Ios::Internal::IosDeviceManager;
diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp
index 8bf2685a9fb..b888c497b9a 100644
--- a/src/plugins/ios/iosdsymbuildstep.cpp
+++ b/src/plugins/ios/iosdsymbuildstep.cpp
@@ -59,8 +59,8 @@ public:
 
 private:
     void setupOutputFormatter(OutputFormatter *formatter) override;
-    void toMap(QVariantMap &map) const override;
-    void fromMap(const QVariantMap &map) override;
+    void toMap(Storage &map) const override;
+    void fromMap(const Storage &map) override;
 
     QStringList defaultCleanCmdList() const;
     QStringList defaultCmdList() const;
@@ -83,7 +83,7 @@ IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent, Id id) :
     setIgnoreReturnValue(m_clean);
 }
 
-void IosDsymBuildStep::toMap(QVariantMap &map) const
+void IosDsymBuildStep::toMap(Storage &map) const
 {
     AbstractProcessStep::toMap(map);
 
@@ -95,7 +95,7 @@ void IosDsymBuildStep::toMap(QVariantMap &map) const
     map.insert(id().withSuffix(COMMAND_PARTIAL_KEY).toString(), command().toSettings());
 }
 
-void IosDsymBuildStep::fromMap(const QVariantMap &map)
+void IosDsymBuildStep::fromMap(const Storage &map)
 {
     QVariant bArgs = map.value(id().withSuffix(ARGUMENTS_PARTIAL_KEY).toString());
     m_arguments = bArgs.toStringList();
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index c0169af68b3..fdcc348c0a4 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -206,7 +206,7 @@ FilePath IosRunConfiguration::localExecutable() const
     return bundleDirectory().pathAppended(applicationName());
 }
 
-void IosDeviceTypeAspect::fromMap(const QVariantMap &map)
+void IosDeviceTypeAspect::fromMap(const Storage &map)
 {
     bool deviceTypeIsInt;
     map.value(deviceTypeKey).toInt(&deviceTypeIsInt);
@@ -216,7 +216,7 @@ void IosDeviceTypeAspect::fromMap(const QVariantMap &map)
     m_runConfiguration->update();
 }
 
-void IosDeviceTypeAspect::toMap(QVariantMap &map) const
+void IosDeviceTypeAspect::toMap(Storage &map) const
 {
     map.insert(deviceTypeKey, deviceType().toMap());
 }
diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h
index 813a0c5524f..8c7c93bf3bc 100644
--- a/src/plugins/ios/iosrunconfiguration.h
+++ b/src/plugins/ios/iosrunconfiguration.h
@@ -27,8 +27,8 @@ public:
     explicit IosDeviceTypeAspect(Utils::AspectContainer *container,
                                  IosRunConfiguration *runConfiguration);
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
     void addToLayout(Layouting::LayoutItem &parent) override;
 
     IosDeviceType deviceType() const;
diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp
index d646052126a..391a77548bc 100644
--- a/src/plugins/ios/iossimulator.cpp
+++ b/src/plugins/ios/iossimulator.cpp
@@ -13,6 +13,7 @@
 #include <QMapIterator>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace Ios::Internal {
 
@@ -72,7 +73,7 @@ IosDeviceType::IosDeviceType(IosDeviceType::Type type, const QString &identifier
     type(type), identifier(identifier), displayName(displayName)
 { }
 
-bool IosDeviceType::fromMap(const QVariantMap &map)
+bool IosDeviceType::fromMap(const Storage &map)
 {
     bool validType;
     displayName = map.value(iosDeviceTypeDisplayNameKey, QVariant()).toString();
diff --git a/src/plugins/ios/iossimulator.h b/src/plugins/ios/iossimulator.h
index 988776e5086..c5b6d4c81e0 100644
--- a/src/plugins/ios/iossimulator.h
+++ b/src/plugins/ios/iossimulator.h
@@ -25,8 +25,8 @@ public:
     IosDeviceType(Type type = IosDevice, const QString &identifier = QString(),
                   const QString &displayName = QString());
 
-    bool fromMap(const QVariantMap &map);
-    QVariantMap toMap() const;
+    bool fromMap(const Utils::Storage &map);
+    Utils::Storage toMap() const;
 
     bool operator ==(const IosDeviceType &o) const;
     bool operator !=(const IosDeviceType &o) const { return !(*this == o); }
diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp
index 349a84f7b88..6a700598461 100644
--- a/src/plugins/languageclient/languageclientsettings.cpp
+++ b/src/plugins/languageclient/languageclientsettings.cpp
@@ -66,6 +66,8 @@ constexpr char typedClientsKey[] = "typedClients";
 constexpr char outlineSortedKey[] = "outlineSorted";
 constexpr char mimeType[] = "application/language.client.setting";
 
+using namespace Utils;
+
 namespace LanguageClient {
 
 class LanguageClientSettingsModel : public QAbstractListModel
@@ -576,7 +578,7 @@ QVariantMap BaseSettings::toMap() const
     return map;
 }
 
-void BaseSettings::fromMap(const QVariantMap &map)
+void BaseSettings::fromMap(const Storage &map)
 {
     m_name = map[nameKey].toString();
     m_id = map.value(idKey, QUuid::createUuid().toString()).toString();
@@ -720,7 +722,7 @@ QVariantMap StdIOSettings::toMap() const
     return map;
 }
 
-void StdIOSettings::fromMap(const QVariantMap &map)
+void StdIOSettings::fromMap(const Storage &map)
 {
     BaseSettings::fromMap(map);
     m_executable = Utils::FilePath::fromSettings(map[executableKey]);
diff --git a/src/plugins/languageclient/languageclientsettings.h b/src/plugins/languageclient/languageclientsettings.h
index bb8ebe631f9..9d32d9e6d76 100644
--- a/src/plugins/languageclient/languageclientsettings.h
+++ b/src/plugins/languageclient/languageclientsettings.h
@@ -79,8 +79,8 @@ public:
     virtual bool isValid() const;
     Client *createClient() const;
     Client *createClient(ProjectExplorer::Project *project) const;
-    virtual QVariantMap toMap() const;
-    virtual void fromMap(const QVariantMap &map);
+    virtual Utils::Storage toMap() const;
+    virtual void fromMap(const Utils::Storage &map);
 
 protected:
     virtual BaseClientInterface *createInterface(ProjectExplorer::Project *) const;
@@ -108,8 +108,8 @@ public:
     QWidget *createSettingsWidget(QWidget *parent = nullptr) const override;
     BaseSettings *copy() const override { return new StdIOSettings(*this); }
     bool isValid() const override;
-    QVariantMap toMap() const override;
-    void fromMap(const QVariantMap &map) override;
+    Utils::Storage toMap() const override;
+    void fromMap(const Utils::Storage &map) override;
     QString arguments() const;
     Utils::CommandLine command() const;
 
diff --git a/src/plugins/languageclient/locatorfilter.cpp b/src/plugins/languageclient/locatorfilter.cpp
index f2f14e7d7c2..7f78130bdb0 100644
--- a/src/plugins/languageclient/locatorfilter.cpp
+++ b/src/plugins/languageclient/locatorfilter.cpp
@@ -76,7 +76,7 @@ LocatorMatcherTask locatorMatcher(Client *client, int maxResultCount,
     };
 
     const Group root {
-        Storage(resultStorage),
+        Tasking::Storage(resultStorage),
         ClientWorkspaceSymbolRequestTask(onQuerySetup, onQueryDone),
         AsyncTask<void>(onFilterSetup)
     };
@@ -135,7 +135,7 @@ LocatorMatcherTask currentDocumentMatcher()
     };
 
     const Group root {
-        Storage(resultStorage),
+        Tasking::Storage(resultStorage),
         CurrentDocumentSymbolsRequestTask(onQuerySetup, onQueryDone),
         AsyncTask<void>(onFilterSetup)
     };
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index b2136e43afd..bd5e45f4e96 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -64,7 +64,7 @@ MercurialDiffEditorController::MercurialDiffEditorController(IDocument *document
     };
 
     const Group root {
-        Storage(diffInputStorage),
+        Tasking::Storage(diffInputStorage),
         ProcessTask(setupDiff, onDiffDone),
         postProcessTask(diffInputStorage)
     };
diff --git a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
index 579efa7035f..0255bc282fa 100644
--- a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
+++ b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp
@@ -137,14 +137,14 @@ void MesonBuildConfiguration::setParameters(const QString &params)
     emit parametersChanged();
 }
 
-void MesonBuildConfiguration::toMap(QVariantMap &map) const
+void MesonBuildConfiguration::toMap(Storage &map) const
 {
     ProjectExplorer::BuildConfiguration::toMap(map);
     map[Constants::BuildConfiguration::BUILD_TYPE_KEY] = mesonBuildTypeName(m_buildType);
     map[Constants::BuildConfiguration::PARAMETERS_KEY] = m_parameters;
 }
 
-void MesonBuildConfiguration::fromMap(const QVariantMap &map)
+void MesonBuildConfiguration::fromMap(const Storage &map)
 {
     ProjectExplorer::BuildConfiguration::fromMap(map);
     m_buildSystem = new MesonBuildSystem{this};
diff --git a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h
index 5721ee5938e..cdd4465e477 100644
--- a/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h
+++ b/src/plugins/mesonprojectmanager/mesonbuildconfiguration.h
@@ -30,8 +30,8 @@ signals:
     void parametersChanged();
 
 private:
-    void toMap(QVariantMap &map) const override;
-    void fromMap(const QVariantMap &map) override;
+    void toMap(Utils::Storage &map) const override;
+    void fromMap(const Utils::Storage &map) override;
 
     MesonBuildType m_buildType;
     ProjectExplorer::NamedWidget *createConfigWidget() final;
diff --git a/src/plugins/mesonprojectmanager/ninjabuildstep.cpp b/src/plugins/mesonprojectmanager/ninjabuildstep.cpp
index 02065c12a98..ec63aa01b8b 100644
--- a/src/plugins/mesonprojectmanager/ninjabuildstep.cpp
+++ b/src/plugins/mesonprojectmanager/ninjabuildstep.cpp
@@ -199,14 +199,14 @@ void NinjaBuildStep::setCommandArgs(const QString &args)
     m_commandArgs = args.trimmed();
 }
 
-void NinjaBuildStep::toMap(QVariantMap &map) const
+void NinjaBuildStep::toMap(Storage &map) const
 {
     AbstractProcessStep::toMap(map);
     map.insert(TARGETS_KEY, m_targetName);
     map.insert(TOOL_ARGUMENTS_KEY, m_commandArgs);
 }
 
-void NinjaBuildStep::fromMap(const QVariantMap &map)
+void NinjaBuildStep::fromMap(const Storage &map)
 {
     m_targetName = map.value(TARGETS_KEY).toString();
     m_commandArgs = map.value(TOOL_ARGUMENTS_KEY).toString();
diff --git a/src/plugins/mesonprojectmanager/ninjabuildstep.h b/src/plugins/mesonprojectmanager/ninjabuildstep.h
index 750ab6d9e0a..aa2eeefba59 100644
--- a/src/plugins/mesonprojectmanager/ninjabuildstep.h
+++ b/src/plugins/mesonprojectmanager/ninjabuildstep.h
@@ -26,8 +26,8 @@ public:
     Q_SIGNAL void targetListChanged();
     Q_SIGNAL void commandChanged();
 
-    void toMap(QVariantMap &map) const override;
-    void fromMap(const QVariantMap &map) override;
+    void toMap(Utils::Storage &map) const override;
+    void fromMap(const Utils::Storage &map) override;
 
 private:
     void update(bool parsingSuccessful);
diff --git a/src/plugins/nim/project/nimblebuildconfiguration.cpp b/src/plugins/nim/project/nimblebuildconfiguration.cpp
index 3a198474983..2df654cb414 100644
--- a/src/plugins/nim/project/nimblebuildconfiguration.cpp
+++ b/src/plugins/nim/project/nimblebuildconfiguration.cpp
@@ -37,13 +37,13 @@ BuildConfiguration::BuildType NimbleBuildConfiguration::buildType() const
     return m_buildType;
 }
 
-void NimbleBuildConfiguration::fromMap(const QVariantMap &map)
+void NimbleBuildConfiguration::fromMap(const Storage &map)
 {
     m_buildType = static_cast<BuildType>(map[Constants::C_NIMBLEBUILDCONFIGURATION_BUILDTYPE].toInt());
     BuildConfiguration::fromMap(map);
 }
 
-void NimbleBuildConfiguration::toMap(QVariantMap &map) const
+void NimbleBuildConfiguration::toMap(Storage &map) const
 {
     BuildConfiguration::toMap(map);
     map[Constants::C_NIMBLEBUILDCONFIGURATION_BUILDTYPE] = buildType();
diff --git a/src/plugins/nim/project/nimblebuildconfiguration.h b/src/plugins/nim/project/nimblebuildconfiguration.h
index 236ea3a15cc..882dd78f1bc 100644
--- a/src/plugins/nim/project/nimblebuildconfiguration.h
+++ b/src/plugins/nim/project/nimblebuildconfiguration.h
@@ -18,8 +18,8 @@ class NimbleBuildConfiguration : public ProjectExplorer::BuildConfiguration
 
     BuildType buildType() const override;
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
 private:
     void setBuildType(BuildType buildType);
diff --git a/src/plugins/nim/project/nimbleproject.cpp b/src/plugins/nim/project/nimbleproject.cpp
index aeb16c8a8df..6c07aaad7bb 100644
--- a/src/plugins/nim/project/nimbleproject.cpp
+++ b/src/plugins/nim/project/nimbleproject.cpp
@@ -13,6 +13,7 @@
 #include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace Nim {
 
@@ -26,13 +27,13 @@ NimbleProject::NimbleProject(const Utils::FilePath &fileName)
     setBuildSystemCreator([] (Target *t) { return new NimbleBuildSystem(t); });
 }
 
-void NimbleProject::toMap(QVariantMap &map) const
+void NimbleProject::toMap(Storage &map) const
 {
     Project::toMap(map);
     map[Constants::C_NIMPROJECT_EXCLUDEDFILES] = m_excludedFiles;
 }
 
-Project::RestoreResult NimbleProject::fromMap(const QVariantMap &map, QString *errorMessage)
+Project::RestoreResult NimbleProject::fromMap(const Storage &map, QString *errorMessage)
 {
     auto result = Project::fromMap(map, errorMessage);
     m_excludedFiles = map.value(Constants::C_NIMPROJECT_EXCLUDEDFILES).toStringList();
diff --git a/src/plugins/nim/project/nimbleproject.h b/src/plugins/nim/project/nimbleproject.h
index 4a71514e898..38038ca15ab 100644
--- a/src/plugins/nim/project/nimbleproject.h
+++ b/src/plugins/nim/project/nimbleproject.h
@@ -16,14 +16,14 @@ public:
     NimbleProject(const Utils::FilePath &filename);
 
     // Keep for compatibility with Qt Creator 4.10
-    void toMap(QVariantMap &map) const final;
+    void toMap(Utils::Storage &map) const final;
 
     QStringList excludedFiles() const;
     void setExcludedFiles(const QStringList &excludedFiles);
 
 protected:
     // Keep for compatibility with Qt Creator 4.10
-    RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) final;
+    RestoreResult fromMap(const Utils::Storage &map, QString *errorMessage) final;
 
     QStringList m_excludedFiles;
 };
diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp
index 5b11856941a..2091e510246 100644
--- a/src/plugins/nim/project/nimcompilerbuildstep.cpp
+++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp
@@ -121,7 +121,7 @@ QWidget *NimCompilerBuildStep::createConfigWidget()
     return widget;
 }
 
-void NimCompilerBuildStep::fromMap(const QVariantMap &map)
+void NimCompilerBuildStep::fromMap(const Storage &map)
 {
     AbstractProcessStep::fromMap(map);
     m_userCompilerOptions = map[Constants::C_NIMCOMPILERBUILDSTEP_USERCOMPILEROPTIONS].toString().split('|');
@@ -129,7 +129,7 @@ void NimCompilerBuildStep::fromMap(const QVariantMap &map)
     m_targetNimFile = FilePath::fromString(map[Constants::C_NIMCOMPILERBUILDSTEP_TARGETNIMFILE].toString());
 }
 
-void NimCompilerBuildStep::toMap(QVariantMap &map) const
+void NimCompilerBuildStep::toMap(Storage &map) const
 {
     AbstractProcessStep::toMap(map);
     map[Constants::C_NIMCOMPILERBUILDSTEP_USERCOMPILEROPTIONS] = m_userCompilerOptions.join('|');
diff --git a/src/plugins/nim/project/nimcompilerbuildstep.h b/src/plugins/nim/project/nimcompilerbuildstep.h
index fdd902af53d..97b1e448f18 100644
--- a/src/plugins/nim/project/nimcompilerbuildstep.h
+++ b/src/plugins/nim/project/nimcompilerbuildstep.h
@@ -26,8 +26,8 @@ private:
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
     QWidget *createConfigWidget() override;
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     void updateTargetNimFile();
     Utils::CommandLine commandLine();
diff --git a/src/plugins/nim/project/nimproject.cpp b/src/plugins/nim/project/nimproject.cpp
index f7cf92fd064..e7f971395f1 100644
--- a/src/plugins/nim/project/nimproject.cpp
+++ b/src/plugins/nim/project/nimproject.cpp
@@ -27,14 +27,14 @@ public:
     Tasks projectIssues(const Kit *k) const final;
 
     // Keep for compatibility with Qt Creator 4.10
-    void toMap(QVariantMap &map) const final;
+    void toMap(Storage &map) const final;
 
     QStringList excludedFiles() const;
     void setExcludedFiles(const QStringList &excludedFiles);
 
 protected:
     // Keep for compatibility with Qt Creator 4.10
-    RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) final;
+    RestoreResult fromMap(const Storage &map, QString *errorMessage) final;
 
     QStringList m_excludedFiles;
 };
@@ -63,13 +63,13 @@ Tasks NimProject::projectIssues(const Kit *k) const
     return result;
 }
 
-void NimProject::toMap(QVariantMap &map) const
+void NimProject::toMap(Storage &map) const
 {
     Project::toMap(map);
     map[Constants::C_NIMPROJECT_EXCLUDEDFILES] = m_excludedFiles;
 }
 
-Project::RestoreResult NimProject::fromMap(const QVariantMap &map, QString *errorMessage)
+Project::RestoreResult NimProject::fromMap(const Storage &map, QString *errorMessage)
 {
     auto result = Project::fromMap(map, errorMessage);
     m_excludedFiles = map.value(Constants::C_NIMPROJECT_EXCLUDEDFILES).toStringList();
diff --git a/src/plugins/nim/project/nimtoolchain.cpp b/src/plugins/nim/project/nimtoolchain.cpp
index 871c4b14c33..52ac24e7767 100644
--- a/src/plugins/nim/project/nimtoolchain.cpp
+++ b/src/plugins/nim/project/nimtoolchain.cpp
@@ -89,7 +89,7 @@ QString NimToolChain::compilerVersion() const
                                 std::get<2>(m_version));
 }
 
-void NimToolChain::fromMap(const QVariantMap &data)
+void NimToolChain::fromMap(const Storage &data)
 {
     ToolChain::fromMap(data);
     if (hasError())
diff --git a/src/plugins/nim/project/nimtoolchain.h b/src/plugins/nim/project/nimtoolchain.h
index c86a35a91a2..82f0e2d8175 100644
--- a/src/plugins/nim/project/nimtoolchain.h
+++ b/src/plugins/nim/project/nimtoolchain.h
@@ -26,7 +26,7 @@ public:
     QList<Utils::OutputLineParser *> createOutputParsers() const final;
     std::unique_ptr<ProjectExplorer::ToolChainConfigWidget> createConfigurationWidget() final;
 
-    void fromMap(const QVariantMap &data) final;
+    void fromMap(const Utils::Storage &data) final;
 
     static bool parseVersion(const Utils::FilePath &path, std::tuple<int, int, int> &version);
 
diff --git a/src/plugins/projectexplorer/buildaspects.cpp b/src/plugins/projectexplorer/buildaspects.cpp
index d44ba31dfa8..79d6ed033b8 100644
--- a/src/plugins/projectexplorer/buildaspects.cpp
+++ b/src/plugins/projectexplorer/buildaspects.cpp
@@ -87,7 +87,7 @@ void BuildDirectoryAspect::setProblem(const QString &description)
     updateProblemLabel();
 }
 
-void BuildDirectoryAspect::toMap(QVariantMap &map) const
+void BuildDirectoryAspect::toMap(Storage &map) const
 {
     FilePathAspect::toMap(map);
     if (!d->sourceDir.isEmpty()) {
@@ -96,7 +96,7 @@ void BuildDirectoryAspect::toMap(QVariantMap &map) const
     }
 }
 
-void BuildDirectoryAspect::fromMap(const QVariantMap &map)
+void BuildDirectoryAspect::fromMap(const Storage &map)
 {
     FilePathAspect::fromMap(map);
     if (!d->sourceDir.isEmpty()) {
diff --git a/src/plugins/projectexplorer/buildaspects.h b/src/plugins/projectexplorer/buildaspects.h
index 5471ce893ae..ade7c14dad5 100644
--- a/src/plugins/projectexplorer/buildaspects.h
+++ b/src/plugins/projectexplorer/buildaspects.h
@@ -28,8 +28,8 @@ public:
     static Utils::FilePath fixupDir(const Utils::FilePath &dir);
 
 private:
-    void toMap(QVariantMap &map) const override;
-    void fromMap(const QVariantMap &map) override;
+    void toMap(Utils::Storage &map) const override;
+    void fromMap(const Utils::Storage &map) override;
 
     void updateProblemLabel();
 
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index 234d4935085..83710cae525 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -372,7 +372,7 @@ void BuildConfiguration::appendInitialCleanStep(Utils::Id id)
     d->m_initialCleanSteps.append(id);
 }
 
-void BuildConfiguration::toMap(QVariantMap &map) const
+void BuildConfiguration::toMap(Storage &map) const
 {
     ProjectConfiguration::toMap(map);
 
@@ -388,7 +388,7 @@ void BuildConfiguration::toMap(QVariantMap &map) const
     map.insert(CUSTOM_PARSERS_KEY, transform(d->m_customParsers,&Utils::Id::toSetting));
 }
 
-void BuildConfiguration::fromMap(const QVariantMap &map)
+void BuildConfiguration::fromMap(const Storage &map)
 {
     d->m_clearSystemEnvironment = map.value(QLatin1String(Constants::CLEAR_SYSTEM_ENVIRONMENT_KEY))
                                       .toBool();
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index 85ee42247bb..cc37e391967 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -68,8 +68,8 @@ public:
     void appendInitialBuildStep(Utils::Id id);
     void appendInitialCleanStep(Utils::Id id);
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     bool isEnabled() const;
     QString disabledReason() const;
@@ -149,7 +149,7 @@ public:
 
     BuildConfiguration *create(Target *parent, const BuildInfo &info) const;
 
-    static BuildConfiguration *restore(Target *parent, const QVariantMap &map);
+    static BuildConfiguration *restore(Target *parent, const Utils::Storage &map);
     static BuildConfiguration *clone(Target *parent, const BuildConfiguration *source);
 
     static BuildConfigurationFactory *find(const Kit *k, const Utils::FilePath &projectPath);
diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index 0f1ca94997a..f30ca9e524a 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -126,13 +126,13 @@ QWidget *BuildStep::createConfigWidget()
     return widget;
 }
 
-void BuildStep::fromMap(const QVariantMap &map)
+void BuildStep::fromMap(const Storage &map)
 {
     m_enabled = map.value(buildStepEnabledKey, true).toBool();
     ProjectConfiguration::fromMap(map);
 }
 
-void BuildStep::toMap(QVariantMap &map) const
+void BuildStep::toMap(Storage &map) const
 {
     ProjectConfiguration::toMap(map);
     map.insert(buildStepEnabledKey, m_enabled);
@@ -397,7 +397,7 @@ BuildStep *BuildStepFactory::create(BuildStepList *parent)
     return step;
 }
 
-BuildStep *BuildStepFactory::restore(BuildStepList *parent, const QVariantMap &map)
+BuildStep *BuildStepFactory::restore(BuildStepList *parent, const Storage &map)
 {
     BuildStep *bs = create(parent);
     if (!bs)
diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h
index 8c37ff3ecde..9118e34db90 100644
--- a/src/plugins/projectexplorer/buildstep.h
+++ b/src/plugins/projectexplorer/buildstep.h
@@ -40,8 +40,8 @@ protected:
 public:
     virtual bool init() = 0;
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     bool enabled() const;
     void setEnabled(bool b);
@@ -137,7 +137,7 @@ public:
     BuildStep::Flags stepFlags() const;
     Utils::Id stepId() const;
     BuildStep *create(BuildStepList *parent);
-    BuildStep *restore(BuildStepList *parent, const QVariantMap &map);
+    BuildStep *restore(BuildStepList *parent, const Utils::Storage &map);
 
     bool canHandle(BuildStepList *bsl) const;
 
diff --git a/src/plugins/projectexplorer/buildsteplist.cpp b/src/plugins/projectexplorer/buildsteplist.cpp
index c5a361a24e8..2895b7925e2 100644
--- a/src/plugins/projectexplorer/buildsteplist.cpp
+++ b/src/plugins/projectexplorer/buildsteplist.cpp
@@ -14,6 +14,8 @@
 
 #include <QDebug>
 
+using namespace Utils;
+
 namespace ProjectExplorer {
 
 const char STEPS_COUNT_KEY[] = "ProjectExplorer.BuildStepList.StepsCount";
@@ -41,9 +43,9 @@ Target *BuildStepList::target() const
     return m_projectConfiguration->target();
 }
 
-QVariantMap BuildStepList::toMap() const
+Storage BuildStepList::toMap() const
 {
-    QVariantMap map;
+    Storage map;
 
     {
         // Only written for compatibility reasons within the 4.11 cycle
@@ -58,7 +60,7 @@ QVariantMap BuildStepList::toMap() const
     // Save build steps
     map.insert(QString::fromLatin1(STEPS_COUNT_KEY), m_steps.count());
     for (int i = 0; i < m_steps.count(); ++i) {
-        QVariantMap data;
+        Storage data;
         m_steps.at(i)->toMap(data);
         map.insert(QString::fromLatin1(STEPS_PREFIX) + QString::number(i), data);
     }
@@ -101,7 +103,7 @@ QString BuildStepList::displayName() const
     return {};
 }
 
-bool BuildStepList::fromMap(const QVariantMap &map)
+bool BuildStepList::fromMap(const Storage &map)
 {
     clear();
 
@@ -109,7 +111,7 @@ bool BuildStepList::fromMap(const QVariantMap &map)
 
     int maxSteps = map.value(QString::fromLatin1(STEPS_COUNT_KEY), 0).toInt();
     for (int i = 0; i < maxSteps; ++i) {
-        QVariantMap bsData(map.value(QString::fromLatin1(STEPS_PREFIX) + QString::number(i)).toMap());
+        Storage bsData(map.value(QString::fromLatin1(STEPS_PREFIX) + QString::number(i)).toMap());
         if (bsData.isEmpty()) {
             qWarning() << "No step data found for" << i << "(continuing).";
             continue;
diff --git a/src/plugins/projectexplorer/buildsteplist.h b/src/plugins/projectexplorer/buildsteplist.h
index a5c32cf1a4a..6af0fc54372 100644
--- a/src/plugins/projectexplorer/buildsteplist.h
+++ b/src/plugins/projectexplorer/buildsteplist.h
@@ -6,9 +6,9 @@
 #include "projectexplorer_export.h"
 
 #include <utils/id.h>
+#include <utils/storage.h>
 
 #include <QObject>
-#include <QVariantMap>
 
 namespace ProjectExplorer {
 
@@ -60,8 +60,8 @@ public:
     ProjectConfiguration *projectConfiguration() const { return m_projectConfiguration; }
     Target *target() const;
 
-    QVariantMap toMap() const;
-    bool fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    bool fromMap(const Utils::Storage &map);
 
     Utils::Id id() const { return m_id; }
     QString displayName() const;
diff --git a/src/plugins/projectexplorer/customparser.cpp b/src/plugins/projectexplorer/customparser.cpp
index c04b240d12d..d406f0cf240 100644
--- a/src/plugins/projectexplorer/customparser.cpp
+++ b/src/plugins/projectexplorer/customparser.cpp
@@ -103,7 +103,7 @@ QVariantMap CustomParserExpression::toMap() const
     return map;
 }
 
-void CustomParserExpression::fromMap(const QVariantMap &map)
+void CustomParserExpression::fromMap(const Storage &map)
 {
     setPattern(map.value(patternKey).toString());
     setMessageCap(map.value(messageCapKey).toInt());
@@ -149,7 +149,7 @@ QVariantMap CustomParserSettings::toMap() const
     return map;
 }
 
-void CustomParserSettings::fromMap(const QVariantMap &map)
+void CustomParserSettings::fromMap(const Storage &map)
 {
     id = Utils::Id::fromSetting(map.value(idKey));
     displayName = map.value(nameKey).toString();
@@ -173,12 +173,12 @@ CustomParsersAspect::CustomParsersAspect(Target *target)
     });
 }
 
-void CustomParsersAspect::fromMap(const QVariantMap &map)
+void CustomParsersAspect::fromMap(const Storage &map)
 {
     m_parsers = transform(map.value(settingsKey()).toList(), &Utils::Id::fromSetting);
 }
 
-void CustomParsersAspect::toMap(QVariantMap &map) const
+void CustomParsersAspect::toMap(Storage &map) const
 {
     map.insert(settingsKey(), transform(m_parsers, &Utils::Id::toSetting));
 }
diff --git a/src/plugins/projectexplorer/customparser.h b/src/plugins/projectexplorer/customparser.h
index d11979bcc21..de49bc00993 100644
--- a/src/plugins/projectexplorer/customparser.h
+++ b/src/plugins/projectexplorer/customparser.h
@@ -44,8 +44,8 @@ public:
     int messageCap() const;
     void setMessageCap(int messageCap);
 
-    QVariantMap toMap() const;
-    void fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    void fromMap(const Utils::Storage &map);
 
 private:
     QRegularExpression m_regExp;
@@ -62,8 +62,8 @@ public:
     bool operator ==(const CustomParserSettings &other) const;
     bool operator !=(const CustomParserSettings &other) const { return !operator==(other); }
 
-    QVariantMap toMap() const;
-    void fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    void fromMap(const Utils::Storage &map);
 
     Utils::Id id;
     QString displayName;
@@ -86,8 +86,8 @@ public:
     };
 
 private:
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     QList<Utils::Id> m_parsers;
 };
diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp
index 74356e8d7a4..0e101b66e33 100644
--- a/src/plugins/projectexplorer/customtoolchain.cpp
+++ b/src/plugins/projectexplorer/customtoolchain.cpp
@@ -77,8 +77,8 @@ public:
     QStringList headerPathsList() const;
     void setHeaderPaths(const QStringList &list);
 
-    void toMap(QVariantMap &data) const override;
-    void fromMap(const QVariantMap &data) override;
+    void toMap(Storage &data) const override;
+    void fromMap(const Storage &data) override;
 
     std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override;
 
@@ -271,7 +271,7 @@ QString CustomToolChain::mkspecs() const
     return m_mkspecs.join(',');
 }
 
-void CustomToolChain::toMap(QVariantMap &data) const
+void CustomToolChain::toMap(Storage &data) const
 {
     ToolChain::toMap(data);
     data.insert(QLatin1String(makeCommandKeyC), m_makeCommand.toString());
@@ -283,7 +283,7 @@ void CustomToolChain::toMap(QVariantMap &data) const
     data.insert(QLatin1String(outputParserKeyC), m_outputParserId.toSetting());
 }
 
-void CustomToolChain::fromMap(const QVariantMap &data)
+void CustomToolChain::fromMap(const Storage &data)
 {
     ToolChain::fromMap(data);
     if (hasError())
diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp
index 3b267b59bb0..6fddd289e05 100644
--- a/src/plugins/projectexplorer/deployconfiguration.cpp
+++ b/src/plugins/projectexplorer/deployconfiguration.cpp
@@ -50,13 +50,13 @@ QWidget *DeployConfiguration::createConfigWidget()
     return m_configWidgetCreator(this);
 }
 
-void DeployConfiguration::toMap(QVariantMap &map) const
+void DeployConfiguration::toMap(Storage &map) const
 {
     ProjectConfiguration::toMap(map);
     map.insert(QLatin1String(BUILD_STEP_LIST_COUNT), 1);
     map.insert(QLatin1String(BUILD_STEP_LIST_PREFIX) + QLatin1Char('0'), m_stepList.toMap());
     map.insert(USES_DEPLOYMENT_DATA, usesCustomDeploymentData());
-    QVariantMap deployData;
+    Storage deployData;
     for (int i = 0; i < m_customDeploymentData.fileCount(); ++i) {
         const DeployableFile &f = m_customDeploymentData.fileAt(i);
         deployData.insert(f.localFilePath().toString(), f.remoteDirectory());
@@ -64,7 +64,7 @@ void DeployConfiguration::toMap(QVariantMap &map) const
     map.insert(DEPLOYMENT_DATA, deployData);
 }
 
-void DeployConfiguration::fromMap(const QVariantMap &map)
+void DeployConfiguration::fromMap(const Storage &map)
 {
     ProjectConfiguration::fromMap(map);
     if (hasError())
@@ -75,7 +75,7 @@ void DeployConfiguration::fromMap(const QVariantMap &map)
         reportError();
         return;
     }
-    QVariantMap data = map.value(QLatin1String(BUILD_STEP_LIST_PREFIX) + QLatin1Char('0')).toMap();
+    Storage data = map.value(QLatin1String(BUILD_STEP_LIST_PREFIX) + QLatin1Char('0')).toMap();
     if (!data.isEmpty()) {
         m_stepList.clear();
         if (!m_stepList.fromMap(data)) {
@@ -91,7 +91,7 @@ void DeployConfiguration::fromMap(const QVariantMap &map)
     }
 
     m_usesCustomDeploymentData = map.value(USES_DEPLOYMENT_DATA, false).toBool();
-    const QVariantMap deployData = map.value(DEPLOYMENT_DATA).toMap();
+    const Storage deployData = map.value(DEPLOYMENT_DATA).toMap();
     for (auto it = deployData.begin(); it != deployData.end(); ++it)
         m_customDeploymentData.addFile(FilePath::fromString(it.key()), it.value().toString());
 }
@@ -188,12 +188,12 @@ DeployConfiguration *DeployConfigurationFactory::create(Target *parent)
 DeployConfiguration *DeployConfigurationFactory::clone(Target *parent,
                                                        const DeployConfiguration *source)
 {
-    QVariantMap map;
+    Storage map;
     source->toMap(map);
     return restore(parent, map);
 }
 
-DeployConfiguration *DeployConfigurationFactory::restore(Target *parent, const QVariantMap &map)
+DeployConfiguration *DeployConfigurationFactory::restore(Target *parent, const Storage &map)
 {
     const Id id = idFromMap(map);
     DeployConfigurationFactory *factory = Utils::findOrDefault(g_deployConfigurationFactories,
diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h
index 48f07d90906..599e424f3cf 100644
--- a/src/plugins/projectexplorer/deployconfiguration.h
+++ b/src/plugins/projectexplorer/deployconfiguration.h
@@ -31,8 +31,8 @@ public:
 
     QWidget *createConfigWidget();
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     bool isActive() const;
 
@@ -66,7 +66,7 @@ public:
     DeployConfiguration *create(Target *parent);
 
     static const QList<DeployConfigurationFactory *> find(Target *parent);
-    static DeployConfiguration *restore(Target *parent, const QVariantMap &map);
+    static DeployConfiguration *restore(Target *parent, const Utils::Storage &map);
     static DeployConfiguration *clone(Target *parent, const DeployConfiguration *dc);
 
     void addSupportedTargetDeviceType(Utils::Id id);
@@ -81,7 +81,7 @@ public:
     void setConfigWidgetCreator(const DeployConfiguration::WidgetCreator &configWidgetCreator);
     void setUseDeploymentDataView();
 
-    using PostRestore = std::function<void(DeployConfiguration *dc, const QVariantMap &)>;
+    using PostRestore = std::function<void(DeployConfiguration *dc, const Utils::Storage &)>;
     void setPostRestore(const PostRestore &postRestore) {  m_postRestore = postRestore; }
     PostRestore postRestore() const { return m_postRestore; }
 
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
index 4f9e07ee64d..65285e9d9e1 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
@@ -129,7 +129,7 @@ FilePath DesktopDevice::rootPath() const
     return IDevice::rootPath();
 }
 
-void DesktopDevice::fromMap(const QVariantMap &map)
+void DesktopDevice::fromMap(const Storage &map)
 {
     IDevice::fromMap(map);
 
diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.h b/src/plugins/projectexplorer/devicesupport/desktopdevice.h
index f37c3f7f948..71fff98d102 100644
--- a/src/plugins/projectexplorer/devicesupport/desktopdevice.h
+++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.h
@@ -36,7 +36,7 @@ public:
     Utils::FilePath rootPath() const override;
     Utils::FilePath filePath(const QString &pathOnDevice) const override;
 
-    void fromMap(const QVariantMap &map) override;
+    void fromMap(const Utils::Storage &map) override;
 
 protected:
     DesktopDevice();
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index f783ea18139..bf12dc56416 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -204,7 +204,7 @@ static const IDeviceFactory *restoreFactory(const QVariantMap &map)
     return factory;
 }
 
-QList<IDevice::Ptr> DeviceManager::fromMap(const QVariantMap &map, QHash<Id, Id> *defaultDevices)
+QList<IDevice::Ptr> DeviceManager::fromMap(const Storage &map, QHash<Id, Id> *defaultDevices)
 {
     QList<IDevice::Ptr> devices;
 
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.h b/src/plugins/projectexplorer/devicesupport/devicemanager.h
index ce12ccf1b83..2f5aa0ea45d 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.h
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.h
@@ -65,8 +65,8 @@ private:
     DeviceManager(bool isInstance = true);
 
     void load();
-    QList<IDevice::Ptr> fromMap(const QVariantMap &map, QHash<Utils::Id, Utils::Id> *defaultDevices);
-    QVariantMap toMap() const;
+    QList<IDevice::Ptr> fromMap(const Utils::Storage &map, QHash<Utils::Id, Utils::Id> *defaultDevices);
+    Utils::Storage toMap() const;
 
     // For SettingsWidget.
     IDevice::Ptr mutableDevice(Utils::Id id) const;
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index cc55991e66a..3fe494eaa24 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -146,7 +146,7 @@ public:
 
     QList<Icon> deviceIcons;
     QList<IDevice::DeviceAction> deviceActions;
-    QVariantMap extraData;
+    Storage extraData;
     IDevice::OpenTerminal openTerminal;
 };
 } // namespace Internal
@@ -420,12 +420,12 @@ void IDevice::setDeviceState(const IDevice::DeviceState state)
     d->deviceState = state;
 }
 
-Id IDevice::typeFromMap(const QVariantMap &map)
+Id IDevice::typeFromMap(const Storage &map)
 {
     return Id::fromSetting(map.value(QLatin1String(TypeKey)));
 }
 
-Id IDevice::idFromMap(const QVariantMap &map)
+Id IDevice::idFromMap(const Storage &map)
 {
     return Id::fromSetting(map.value(QLatin1String(IdKey)));
 }
@@ -436,7 +436,7 @@ Id IDevice::idFromMap(const QVariantMap &map)
     base class implementation.
 */
 
-void IDevice::fromMap(const QVariantMap &map)
+void IDevice::fromMap(const Storage &map)
 {
     d->type = typeFromMap(map);
     d->displayName.fromMap(map, DisplayNameKey);
@@ -485,7 +485,7 @@ void IDevice::fromMap(const QVariantMap &map)
     call the base class implementation.
 */
 
-QVariantMap IDevice::toMap() const
+Storage IDevice::toMap() const
 {
     QVariantMap map;
     d->displayName.toMap(map, DisplayNameKey);
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h
index 13b70892a70..d34e49cd6c2 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.h
+++ b/src/plugins/projectexplorer/devicesupport/idevice.h
@@ -12,6 +12,7 @@
 #include <utils/expected.h>
 #include <utils/filepath.h>
 #include <utils/hostosinfo.h>
+#include <utils/storage.h>
 
 #include <QAbstractSocket>
 #include <QCoreApplication>
@@ -19,7 +20,6 @@
 #include <QObject>
 #include <QSharedPointer>
 #include <QUrl>
-#include <QVariantMap>
 
 #include <functional>
 #include <memory>
@@ -150,8 +150,8 @@ public:
     void setDeviceState(const DeviceState state);
     QString deviceStateToString() const;
 
-    static Utils::Id typeFromMap(const QVariantMap &map);
-    static Utils::Id idFromMap(const QVariantMap &map);
+    static Utils::Id typeFromMap(const Utils::Storage &map);
+    static Utils::Id idFromMap(const Utils::Storage &map);
 
     static QString defaultPrivateKeyFilePath();
     static QString defaultPublicKeyFilePath();
@@ -218,8 +218,8 @@ public:
 protected:
     IDevice();
 
-    virtual void fromMap(const QVariantMap &map);
-    virtual QVariantMap toMap() const;
+    virtual void fromMap(const Utils::Storage &map);
+    virtual Utils::Storage toMap() const;
 
     using OpenTerminal = std::function<void(const Utils::Environment &, const Utils::FilePath &)>;
     void setOpenTerminal(const OpenTerminal &openTerminal);
diff --git a/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp b/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
index 2ff351a8c29..4a5b9b55308 100644
--- a/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
@@ -37,14 +37,14 @@ namespace ProjectExplorer {
 */
 
 /*!
-    \fn virtual bool canRestore(const QVariantMap &map) const = 0
+    \fn virtual bool canRestore(const Utils::Storage &map) const = 0
 
     Checks whether this factory can restore a device from the serialized state
     specified by \a map.
 */
 
 /*!
-    \fn virtual IDevice::Ptr restore(const QVariantMap &map) const = 0
+    \fn virtual IDevice::Ptr restore(const Utils::Storage &map) const = 0
 
     Loads a device from a serialized state. Only called if \c canRestore()
     returns true for \a map.
diff --git a/src/plugins/projectexplorer/devicesupport/idevicefactory.h b/src/plugins/projectexplorer/devicesupport/idevicefactory.h
index 665059f5b2c..c6af716ad73 100644
--- a/src/plugins/projectexplorer/devicesupport/idevicefactory.h
+++ b/src/plugins/projectexplorer/devicesupport/idevicefactory.h
@@ -4,11 +4,13 @@
 #pragma once
 
 #include "idevicefwd.h"
+
 #include <projectexplorer/projectexplorer_export.h>
+
 #include <utils/id.h>
+#include <utils/storage.h>
 
 #include <QIcon>
-#include <QVariantMap>
 
 namespace Utils { class FilePath; }
 
@@ -28,7 +30,7 @@ public:
     IDevicePtr create() const;
     bool quickCreationAllowed() const;
 
-    virtual bool canRestore(const QVariantMap &) const { return true; }
+    virtual bool canRestore(const Utils::Storage &) const { return true; }
 
     static IDeviceFactory *find(Utils::Id type);
 
diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp
index ff99bc25e83..3642ec90a2c 100644
--- a/src/plugins/projectexplorer/editorconfiguration.cpp
+++ b/src/plugins/projectexplorer/editorconfiguration.cpp
@@ -34,6 +34,7 @@ static const QLatin1String kCodeStylePrefix("EditorConfiguration.CodeStyle.");
 static const QLatin1String kCodeStyleCount("EditorConfiguration.CodeStyle.Count");
 
 using namespace TextEditor;
+using namespace Utils;
 
 namespace ProjectExplorer {
 
@@ -194,7 +195,7 @@ QVariantMap EditorConfiguration::toMap() const
     return map;
 }
 
-void EditorConfiguration::fromMap(const QVariantMap &map)
+void EditorConfiguration::fromMap(const Storage &map)
 {
     const QByteArray &codecName = map.value(kCodec, d->m_textCodec->name()).toByteArray();
     d->m_textCodec = QTextCodec::codecForName(codecName);
diff --git a/src/plugins/projectexplorer/editorconfiguration.h b/src/plugins/projectexplorer/editorconfiguration.h
index 031e5762876..cee0d8e5e94 100644
--- a/src/plugins/projectexplorer/editorconfiguration.h
+++ b/src/plugins/projectexplorer/editorconfiguration.h
@@ -6,9 +6,9 @@
 #include "projectexplorer_export.h"
 
 #include <utils/id.h>
+#include <utils/storage.h>
 
 #include <QObject>
-#include <QVariantMap>
 
 #include <memory>
 
@@ -64,8 +64,8 @@ public:
     void configureEditor(TextEditor::BaseTextEditor *textEditor) const;
     void deconfigureEditor(TextEditor::BaseTextEditor *textEditor) const;
 
-    QVariantMap toMap() const;
-    void fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    void fromMap(const Utils::Storage &map);
 
     void setTypingSettings(const TextEditor::TypingSettings &settings);
     void setStorageSettings(const TextEditor::StorageSettings &settings);
diff --git a/src/plugins/projectexplorer/environmentaspect.cpp b/src/plugins/projectexplorer/environmentaspect.cpp
index cae48b2f329..cc6a2d79b4d 100644
--- a/src/plugins/projectexplorer/environmentaspect.cpp
+++ b/src/plugins/projectexplorer/environmentaspect.cpp
@@ -133,14 +133,14 @@ void EnvironmentAspect::setSupportForBuildEnvironment(Target *target)
             this, &EnvironmentAspect::environmentChanged);
 }
 
-void EnvironmentAspect::fromMap(const QVariantMap &map)
+void EnvironmentAspect::fromMap(const Storage &map)
 {
     m_base = map.value(QLatin1String(BASE_KEY), -1).toInt();
     m_userChanges = Utils::EnvironmentItem::fromStringList(map.value(QLatin1String(CHANGES_KEY)).toStringList());
     m_printOnRun = map.value(PRINT_ON_RUN_KEY).toBool();
 }
 
-void EnvironmentAspect::toMap(QVariantMap &data) const
+void EnvironmentAspect::toMap(Storage &data) const
 {
     data.insert(QLatin1String(BASE_KEY), m_base);
     data.insert(QLatin1String(CHANGES_KEY), Utils::EnvironmentItem::toStringList(m_userChanges));
diff --git a/src/plugins/projectexplorer/environmentaspect.h b/src/plugins/projectexplorer/environmentaspect.h
index ee1bb7e1831..9fd8ccacbba 100644
--- a/src/plugins/projectexplorer/environmentaspect.h
+++ b/src/plugins/projectexplorer/environmentaspect.h
@@ -9,9 +9,7 @@
 
 #include <utils/aspects.h>
 #include <utils/environment.h>
-
-#include <QList>
-#include <QVariantMap>
+#include <utils/storage.h>
 
 namespace ProjectExplorer {
 
@@ -73,8 +71,8 @@ signals:
     void environmentChanged();
 
 protected:
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     void setIsLocal(bool local) { m_isLocal = local; }
     void setAllowPrintOnRun(bool allow) { m_allowPrintOnRun = allow; }
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index ccbf9f8db88..eb1deadaae9 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -795,7 +795,7 @@ QStringList GccToolChain::platformLinkerFlags() const
     return m_platformLinkerFlags;
 }
 
-void GccToolChain::toMap(QVariantMap &data) const
+void GccToolChain::toMap(Storage &data) const
 {
     ToolChain::toMap(data);
     data.insert(compilerPlatformCodeGenFlagsKeyC, m_platformCodeGenFlags);
@@ -804,7 +804,7 @@ void GccToolChain::toMap(QVariantMap &data) const
     data.insert(supportedAbisKeyC, Utils::transform<QStringList>(m_supportedAbis, &Abi::toString));
 }
 
-void GccToolChain::fromMap(const QVariantMap &data)
+void GccToolChain::fromMap(const Storage &data)
 {
     ToolChain::fromMap(data);
     if (hasError())
@@ -1711,14 +1711,14 @@ std::unique_ptr<ToolChainConfigWidget> ClangToolChain::createConfigurationWidget
     return std::make_unique<ClangToolChainConfigWidget>(this);
 }
 
-void ClangToolChain::toMap(QVariantMap &data) const
+void ClangToolChain::toMap(Storage &data) const
 {
     GccToolChain::toMap(data);
     data.insert(parentToolChainIdKeyC, m_parentToolChainId);
     data.insert(priorityKeyC, m_priority);
 }
 
-void ClangToolChain::fromMap(const QVariantMap &data)
+void ClangToolChain::fromMap(const Storage &data)
 {
     GccToolChain::fromMap(data);
     if (hasError())
diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h
index 3e92ea01c69..d46af2471f7 100644
--- a/src/plugins/projectexplorer/gcctoolchain.h
+++ b/src/plugins/projectexplorer/gcctoolchain.h
@@ -66,8 +66,8 @@ public:
     QStringList suggestedMkspecList() const override;
     QList<Utils::OutputLineParser *> createOutputParsers() const override;
 
-    void toMap(QVariantMap &data) const override;
-    void fromMap(const QVariantMap &data) override;
+    void toMap(Utils::Storage &data) const override;
+    void fromMap(const Utils::Storage &data) override;
 
     std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override;
 
@@ -207,8 +207,8 @@ public:
 
     std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override;
 
-    void toMap(QVariantMap &data) const override;
-    void fromMap(const QVariantMap &data) override;
+    void toMap(Utils::Storage &data) const override;
+    void fromMap(const Utils::Storage &data) override;
 
     void setPriority(int priority) { m_priority = priority; }
     int priority() const override { return m_priority; }
diff --git a/src/plugins/projectexplorer/kit.h b/src/plugins/projectexplorer/kit.h
index 18c0cc4298f..ea8f04ea1c4 100644
--- a/src/plugins/projectexplorer/kit.h
+++ b/src/plugins/projectexplorer/kit.h
@@ -8,8 +8,9 @@
 
 #include <coreplugin/featureprovider.h>
 
+#include <utils/storage.h>
+
 #include <QSet>
-#include <QVariant>
 
 #include <memory>
 
@@ -138,7 +139,7 @@ private:
 
     void kitUpdated();
 
-    QVariantMap toMap() const;
+    Utils::Storage toMap() const;
 
     const std::unique_ptr<Internal::KitPrivate> d;
 
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 2e692287ebd..2e3dee898b2 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -978,7 +978,7 @@ Abis MsvcToolChain::supportedAbis() const
     return abis;
 }
 
-void MsvcToolChain::toMap(QVariantMap &data) const
+void MsvcToolChain::toMap(Storage &data) const
 {
     ToolChain::toMap(data);
     data.insert(QLatin1String(varsBatKeyC), m_vcvarsBat);
@@ -989,7 +989,7 @@ void MsvcToolChain::toMap(QVariantMap &data) const
                 Utils::EnvironmentItem::toVariantList(m_environmentModifications));
 }
 
-void MsvcToolChain::fromMap(const QVariantMap &data)
+void MsvcToolChain::fromMap(const Storage &data)
 {
     ToolChain::fromMap(data);
     if (hasError()) {
@@ -1727,13 +1727,13 @@ static inline QString llvmDirKey()
     return QStringLiteral("ProjectExplorer.ClangClToolChain.LlvmDir");
 }
 
-void ClangClToolChain::toMap(QVariantMap &data) const
+void ClangClToolChain::toMap(Storage &data) const
 {
     MsvcToolChain::toMap(data);
     data.insert(llvmDirKey(), m_clangPath.toString());
 }
 
-void ClangClToolChain::fromMap(const QVariantMap &data)
+void ClangClToolChain::fromMap(const Storage &data)
 {
     MsvcToolChain::fromMap(data);
     if (hasError())
diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h
index 9f0b867466a..79ecdc21c30 100644
--- a/src/plugins/projectexplorer/msvctoolchain.h
+++ b/src/plugins/projectexplorer/msvctoolchain.h
@@ -46,8 +46,8 @@ public:
     QStringList suggestedMkspecList() const override;
     Abis supportedAbis() const override;
 
-    void toMap(QVariantMap &data) const override;
-    void fromMap(const QVariantMap &data) override;
+    void toMap(Utils::Storage &data) const override;
+    void fromMap(const Utils::Storage &data) override;
 
     std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override;
     bool hostPrefersToolchain() const override;
@@ -146,8 +146,8 @@ public:
     void addToEnvironment(Utils::Environment &env) const override;
     Utils::FilePath compilerCommand() const override; // FIXME: Remove
     QList<Utils::OutputLineParser *> createOutputParsers() const override;
-    void toMap(QVariantMap &data) const override;
-    void fromMap(const QVariantMap &data) override;
+    void toMap(Utils::Storage &data) const override;
+    void fromMap(const Utils::Storage &data) override;
     std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override;
     BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(
             const Utils::Environment &env) const override;
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index fd91b4aaf55..af61ba60a49 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -691,7 +691,7 @@ FilePaths Project::files(const NodeMatcher &filter) const
     creating new build configurations.
 */
 
-void Project::toMap(QVariantMap &map) const
+void Project::toMap(Storage &map) const
 {
     const QList<Target *> ts = targets();
 
@@ -764,7 +764,7 @@ ContainerNode *Project::containerNode() const
     return d->m_containerNode.get();
 }
 
-Project::RestoreResult Project::fromMap(const QVariantMap &map, QString *errorMessage)
+Project::RestoreResult Project::fromMap(const Storage &map, QString *errorMessage)
 {
     Q_UNUSED(errorMessage)
     if (map.contains(QLatin1String(EDITOR_SETTINGS_KEY))) {
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index 93c1611bb1e..61df7925ce4 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -12,6 +12,7 @@
 
 #include <utils/environmentfwd.h>
 #include <utils/filepath.h>
+#include <utils/storage.h>
 
 #include <QFileSystemModel>
 
@@ -111,7 +112,7 @@ public:
                                 const NodeMatcher &extraMatcher = {}) const;
     Utils::FilePaths binariesForSourceFile(const Utils::FilePath &sourceFile) const;
 
-    virtual void toMap(QVariantMap &map) const;
+    virtual void toMap(Utils::Storage &map) const;
 
     Core::Context projectContext() const;
     Core::Context projectLanguages() const;
@@ -204,7 +205,7 @@ signals:
 #endif
 
 protected:
-    virtual RestoreResult fromMap(const QVariantMap &map, QString *errorMessage);
+    virtual RestoreResult fromMap(const Utils::Storage &map, QString *errorMessage);
     void createTargetFromMap(const QVariantMap &map, int index);
     virtual bool setupTarget(Target *t);
 
diff --git a/src/plugins/projectexplorer/projectconfiguration.cpp b/src/plugins/projectexplorer/projectconfiguration.cpp
index e793ec920c3..f7fe5fdba07 100644
--- a/src/plugins/projectexplorer/projectconfiguration.cpp
+++ b/src/plugins/projectexplorer/projectconfiguration.cpp
@@ -72,7 +72,7 @@ QString ProjectConfiguration::toolTip() const
     return m_toolTip;
 }
 
-void ProjectConfiguration::toMap(QVariantMap &map) const
+void ProjectConfiguration::toMap(Storage &map) const
 {
     QTC_CHECK(m_id.isValid());
     map.insert(QLatin1String(CONFIGURATION_ID_KEY), m_id.toSetting());
@@ -85,7 +85,7 @@ Target *ProjectConfiguration::target() const
     return m_target;
 }
 
-void ProjectConfiguration::fromMap(const QVariantMap &map)
+void ProjectConfiguration::fromMap(const Storage &map)
 {
     Utils::Id id = Utils::Id::fromSetting(map.value(QLatin1String(CONFIGURATION_ID_KEY)));
     // Note: This is only "startsWith", not ==, as RunConfigurations currently still
diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h
index b0f722d8054..debad33196f 100644
--- a/src/plugins/projectexplorer/projectconfiguration.h
+++ b/src/plugins/projectexplorer/projectconfiguration.h
@@ -8,11 +8,9 @@
 #include <utils/aspects.h>
 #include <utils/displayname.h>
 #include <utils/id.h>
+#include <utils/storage.h>
 
-#include <QObject>
 #include <QPointer>
-#include <QString>
-#include <QVariantMap>
 #include <QWidget>
 
 namespace ProjectExplorer {
@@ -47,9 +45,9 @@ public:
     bool hasError() const { return m_hasError; }
 
     // Note: Make sure subclasses call the superclasses' fromMap() function!
-    virtual void fromMap(const QVariantMap &map) override;
+    virtual void fromMap(const Utils::Storage &map) override;
     // Note: Make sure subclasses call the superclasses' toMap() function!
-    virtual void toMap(QVariantMap &map) const override;
+    virtual void toMap(Utils::Storage &map) const override;
 
     Target *target() const;
     Project *project() const;
@@ -70,6 +68,6 @@ private:
 };
 
 // helper function:
-PROJECTEXPLORER_EXPORT Utils::Id idFromMap(const QVariantMap &map);
+PROJECTEXPLORER_EXPORT Utils::Id idFromMap(const Utils::Storage &map);
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 1fdb80a0b87..f75344cf38c 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -85,21 +85,21 @@ AspectContainer *GlobalOrProjectAspect::currentSettings() const
    return m_useGlobalSettings ? m_globalSettings : m_projectSettings;
 }
 
-void GlobalOrProjectAspect::fromMap(const QVariantMap &map)
+void GlobalOrProjectAspect::fromMap(const Storage &map)
 {
     if (m_projectSettings)
         m_projectSettings->fromMap(map);
     m_useGlobalSettings = map.value(id().toString() + ".UseGlobalSettings", true).toBool();
 }
 
-void GlobalOrProjectAspect::toMap(QVariantMap &map) const
+void GlobalOrProjectAspect::toMap(Storage &map) const
 {
     if (m_projectSettings)
         m_projectSettings->toMap(map);
     map.insert(id().toString() + ".UseGlobalSettings", m_useGlobalSettings);
 }
 
-void GlobalOrProjectAspect::toActiveMap(QVariantMap &data) const
+void GlobalOrProjectAspect::toActiveMap(Storage &data) const
 {
     if (m_useGlobalSettings)
         m_globalSettings->toMap(data);
@@ -113,7 +113,7 @@ void GlobalOrProjectAspect::toActiveMap(QVariantMap &data) const
 void GlobalOrProjectAspect::resetProjectToGlobalSettings()
 {
     QTC_ASSERT(m_globalSettings, return);
-    QVariantMap map;
+    Storage map;
     m_globalSettings->toMap(map);
     if (m_projectSettings)
         m_projectSettings->fromMap(map);
@@ -226,7 +226,7 @@ bool RunConfiguration::isCustomized() const
 {
     if (m_customized)
         return true;
-    QVariantMap state;
+    Storage state;
     toMapSimple(state);
 
     // TODO: Why do we save this at all? It's a computed value.
@@ -257,9 +257,9 @@ void RunConfiguration::addAspectFactory(const AspectFactory &aspectFactory)
     theAspectFactories.push_back(aspectFactory);
 }
 
-QMap<Utils::Id, QVariantMap> RunConfiguration::settingsData() const
+QMap<Id, Storage> RunConfiguration::settingsData() const
 {
-    QMap<Utils::Id, QVariantMap> data;
+    QMap<Id, Storage> data;
     for (BaseAspect *aspect : *this)
         aspect->toActiveMap(data[aspect->id()]);
     return data;
@@ -288,13 +288,13 @@ Task RunConfiguration::createConfigurationIssue(const QString &description) cons
     return BuildSystemTask(Task::Error, description);
 }
 
-void RunConfiguration::toMap(QVariantMap &map) const
+void RunConfiguration::toMap(Storage &map) const
 {
     toMapSimple(map);
     map.insert(CUSTOMIZED_KEY, isCustomized());
 }
 
-void RunConfiguration::toMapSimple(QVariantMap &map) const
+void RunConfiguration::toMapSimple(Storage &map) const
 {
     ProjectConfiguration::toMap(map);
     map.insert(BUILD_KEY, m_buildKey);
@@ -355,7 +355,7 @@ ProjectNode *RunConfiguration::productNode() const
     });
 }
 
-void RunConfiguration::fromMap(const QVariantMap &map)
+void RunConfiguration::fromMap(const Storage &map)
 {
     ProjectConfiguration::fromMap(map);
     if (hasError())
@@ -611,7 +611,7 @@ RunConfiguration *RunConfigurationCreationInfo::create(Target *target) const
     return rc;
 }
 
-RunConfiguration *RunConfigurationFactory::restore(Target *parent, const QVariantMap &map)
+RunConfiguration *RunConfigurationFactory::restore(Target *parent, const Storage &map)
 {
     for (RunConfigurationFactory *factory : std::as_const(g_runConfigurationFactories)) {
         if (factory->canHandle(parent)) {
@@ -634,7 +634,7 @@ RunConfiguration *RunConfigurationFactory::restore(Target *parent, const QVarian
 
 RunConfiguration *RunConfigurationFactory::clone(Target *parent, RunConfiguration *source)
 {
-    QVariantMap map;
+    Storage map;
     source->toMap(map);
     return restore(parent, map);
 }
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 6caf5775b4d..520b26f000c 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -60,9 +60,9 @@ public:
 
 protected:
     friend class RunConfiguration;
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &data) const override;
-    void toActiveMap(QVariantMap &data) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &data) const override;
+    void toActiveMap(Utils::Storage &data) const override;
 
 private:
     bool m_useGlobalSettings = false;
@@ -122,7 +122,7 @@ public:
         addAspectFactory([](Target *target) { return new T(target); });
     }
 
-    QMap<Utils::Id, QVariantMap> settingsData() const; // FIXME: Merge into aspectData?
+    QMap<Utils::Id, Utils::Storage> settingsData() const; // FIXME: Merge into aspectData?
     Utils::AspectContainerData aspectData() const;
 
     void update();
@@ -145,9 +145,9 @@ protected:
 
 private:
     // Any additional data should be handled by aspects.
-    void fromMap(const QVariantMap &map) final;
-    void toMap(QVariantMap &map) const final;
-    void toMapSimple(QVariantMap &map) const;
+    void fromMap(const Utils::Storage &map) final;
+    void toMap(Utils::Storage &map) const final;
+    void toMapSimple(Utils::Storage &map) const;
 
     static void addAspectFactory(const AspectFactory &aspectFactory);
 
@@ -160,7 +160,7 @@ private:
     RunnableModifier m_runnableModifier;
     Updater m_updater;
     Utils::MacroExpander m_expander;
-    QVariantMap m_pristineState;
+    Utils::Storage m_pristineState;
     bool m_customized = false;
 };
 
@@ -187,7 +187,7 @@ public:
     RunConfigurationFactory operator=(const RunConfigurationFactory &) = delete;
     virtual ~RunConfigurationFactory();
 
-    static RunConfiguration *restore(Target *parent, const QVariantMap &map);
+    static RunConfiguration *restore(Target *parent, const Utils::Storage &map);
     static RunConfiguration *clone(Target *parent, RunConfiguration *source);
     static const QList<RunConfigurationCreationInfo> creatorsForTarget(Target *parent);
 
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp
index 158a102ad1b..36f6ebd2722 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp
@@ -80,7 +80,7 @@ void TerminalAspect::addToLayout(LayoutItem &parent)
 /*!
     \reimp
 */
-void TerminalAspect::fromMap(const QVariantMap &map)
+void TerminalAspect::fromMap(const Storage &map)
 {
     if (map.contains(settingsKey())) {
         m_useTerminal = map.value(settingsKey()).toBool();
@@ -96,7 +96,7 @@ void TerminalAspect::fromMap(const QVariantMap &map)
 /*!
     \reimp
 */
-void TerminalAspect::toMap(QVariantMap &data) const
+void TerminalAspect::toMap(Storage &data) const
 {
     if (m_userSet)
         data.insert(settingsKey(), m_useTerminal);
@@ -214,7 +214,7 @@ void WorkingDirectoryAspect::resetPath()
 /*!
     \reimp
 */
-void WorkingDirectoryAspect::fromMap(const QVariantMap &map)
+void WorkingDirectoryAspect::fromMap(const Storage &map)
 {
     m_workingDirectory = FilePath::fromString(map.value(settingsKey()).toString());
     m_defaultWorkingDirectory = FilePath::fromString(map.value(settingsKey() + ".default").toString());
@@ -229,7 +229,7 @@ void WorkingDirectoryAspect::fromMap(const QVariantMap &map)
 /*!
     \reimp
 */
-void WorkingDirectoryAspect::toMap(QVariantMap &data) const
+void WorkingDirectoryAspect::toMap(Storage &data) const
 {
     const QString wd = m_workingDirectory == m_defaultWorkingDirectory
         ? QString() : m_workingDirectory.toString();
@@ -397,7 +397,7 @@ void ArgumentsAspect::resetArguments()
 /*!
     \reimp
 */
-void ArgumentsAspect::fromMap(const QVariantMap &map)
+void ArgumentsAspect::fromMap(const Storage &map)
 {
     QVariant args = map.value(settingsKey());
     // Until 3.7 a QStringList was stored for Remote Linux
@@ -419,7 +419,7 @@ void ArgumentsAspect::fromMap(const QVariantMap &map)
 /*!
     \reimp
 */
-void ArgumentsAspect::toMap(QVariantMap &map) const
+void ArgumentsAspect::toMap(Storage &map) const
 {
     saveToMap(map, m_arguments, QString(), settingsKey());
     saveToMap(map, m_multiLine, false, settingsKey() + ".multi");
@@ -693,7 +693,7 @@ void ExecutableAspect::setSettingsKey(const QString &key)
 /*!
   \reimp
 */
-void ExecutableAspect::fromMap(const QVariantMap &map)
+void ExecutableAspect::fromMap(const Storage &map)
 {
     m_executable.fromMap(map);
     if (m_alternativeExecutable)
@@ -703,7 +703,7 @@ void ExecutableAspect::fromMap(const QVariantMap &map)
 /*!
    \reimp
 */
-void ExecutableAspect::toMap(QVariantMap &map) const
+void ExecutableAspect::toMap(Storage &map) const
 {
     m_executable.toMap(map);
     if (m_alternativeExecutable)
@@ -837,12 +837,12 @@ void InterpreterAspect::setCurrentInterpreter(const Interpreter &interpreter)
     }
 }
 
-void InterpreterAspect::fromMap(const QVariantMap &map)
+void InterpreterAspect::fromMap(const Storage &map)
 {
     setCurrentInterpreterId(map.value(settingsKey(), m_defaultId).toString());
 }
 
-void InterpreterAspect::toMap(QVariantMap &map) const
+void InterpreterAspect::toMap(Storage &map) const
 {
     if (m_currentId != m_defaultId)
         saveToMap(map, m_currentId, QString(), settingsKey());
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.h b/src/plugins/projectexplorer/runconfigurationaspects.h
index e9f88d8a011..9a3cb812da4 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.h
+++ b/src/plugins/projectexplorer/runconfigurationaspects.h
@@ -43,8 +43,8 @@ public:
     };
 
 private:
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     void calculateUseTerminal();
 
@@ -73,8 +73,8 @@ public:
     void setEnvironment(EnvironmentAspect *envAspect);
 
 private:
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     void resetPath();
 
@@ -111,8 +111,8 @@ public:
     };
 
 private:
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     QWidget *setupChooser();
 
@@ -183,8 +183,8 @@ public:
     };
 
 protected:
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
 private:
     QString executableText() const;
@@ -238,8 +238,8 @@ public:
     void setCurrentInterpreter(const Interpreter &interpreter);
     void setSettingsDialogId(Utils::Id id) { m_settingsDialogId = id; }
 
-    void fromMap(const QVariantMap &) override;
-    void toMap(QVariantMap &) const override;
+    void fromMap(const Utils::Storage &) override;
+    void toMap(Utils::Storage &) const override;
     void addToLayout(Layouting::LayoutItem &parent) override;
 
     struct Data : Utils::BaseAspect::Data { Interpreter interpreter; };
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index deea1ef32ef..df6bbbe24be 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -885,7 +885,7 @@ void Target::updateDeviceState()
     setOverlayIcon(overlay);
 }
 
-bool Target::fromMap(const QVariantMap &map)
+bool Target::fromMap(const Storage &map)
 {
     QTC_ASSERT(d->m_kit == KitManager::kit(id()), return false);
 
diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h
index 6e4f06abd04..f43d21eba55 100644
--- a/src/plugins/projectexplorer/target.h
+++ b/src/plugins/projectexplorer/target.h
@@ -6,6 +6,7 @@
 #include "projectexplorer_export.h"
 
 #include <utils/id.h>
+#include <utils/storage.h>
 
 #include <QObject>
 
@@ -87,7 +88,7 @@ public:
     void setOverlayIcon(const QIcon &icon);
     QString overlayIconToolTip();
 
-    QVariantMap toMap() const;
+    Utils::Storage toMap() const;
 
     void updateDefaultBuildConfigurations();
     void updateDefaultDeployConfigurations();
@@ -145,7 +146,7 @@ signals:
     void deploymentDataChanged();
 
 private:
-    bool fromMap(const QVariantMap &map);
+    bool fromMap(const Utils::Storage &map);
 
     void updateDeviceState();
 
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 1091b1a9a63..e055b21b2c8 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -241,7 +241,7 @@ ToolChain *ToolChain::clone() const
     Make sure to call this function when deriving.
 */
 
-void ToolChain::toMap(QVariantMap &result) const
+void ToolChain::toMap(Storage &result) const
 {
     AspectContainer::toMap(result);
 
@@ -350,7 +350,7 @@ void ToolChain::setTypeDisplayName(const QString &typeName)
     Make sure to call this function when deriving.
 */
 
-void ToolChain::fromMap(const QVariantMap &data)
+void ToolChain::fromMap(const Storage &data)
 {
     AspectContainer::fromMap(data);
 
@@ -711,7 +711,7 @@ QVariantMap BadToolchain::toMap() const
             {badToolchainTimestampKey(), timestamp.toMSecsSinceEpoch()}};
 }
 
-BadToolchain BadToolchain::fromMap(const QVariantMap &map)
+BadToolchain BadToolchain::fromMap(const Storage &map)
 {
     return {
         FilePath::fromSettings(map.value(badToolchainFilePathKey())),
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index 023f729fec1..21efe430fbd 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -147,7 +147,7 @@ public:
 
     // Used by the toolchainmanager to save user-generated tool chains.
     // Make sure to call this function when deriving!
-    virtual void toMap(QVariantMap &map) const;
+    virtual void toMap(Utils::Storage &map) const;
     virtual Tasks validateKit(const Kit *k) const;
 
     virtual bool isJobCountSupported() const { return true; }
@@ -184,7 +184,7 @@ protected:
     void toolChainUpdated();
 
     // Make sure to call this function when deriving!
-    virtual void fromMap(const QVariantMap &data);
+    virtual void fromMap(const Utils::Storage &data);
 
     void reportError();
     bool hasError() const;
@@ -214,8 +214,8 @@ public:
     BadToolchain(const Utils::FilePath &filePath, const Utils::FilePath &symlinkTarget,
                  const QDateTime &timestamp);
 
-    QVariantMap toMap() const;
-    static BadToolchain fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    static BadToolchain fromMap(const Utils::Storage &map);
 
     Utils::FilePath filePath;
     Utils::FilePath symlinkTarget;
diff --git a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
index 52af2cc5db3..df0d7a4aa5d 100644
--- a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
+++ b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
@@ -320,13 +320,13 @@ public:
         return static_cast<const TTC *>(&other)->token == token;
     }
 
-    void fromMap(const QVariantMap &data) final
+    void fromMap(const Storage &data) final
     {
         ToolChain::fromMap(data);
         token = data.value(TestTokenKey).toByteArray();
     }
 
-    void toMap(QVariantMap &data) const final
+    void toMap(Storage &data) const final
     {
         ToolChain::toMap(data);
         data[TestTokenKey] = token;
diff --git a/src/plugins/python/pythonproject.cpp b/src/plugins/python/pythonproject.cpp
index 85110be4863..b0610b85806 100644
--- a/src/plugins/python/pythonproject.cpp
+++ b/src/plugins/python/pythonproject.cpp
@@ -419,7 +419,7 @@ QList<PythonBuildSystem::FileEntry> PythonBuildSystem::processEntries(
     return processed;
 }
 
-Project::RestoreResult PythonProject::fromMap(const QVariantMap &map, QString *errorMessage)
+Project::RestoreResult PythonProject::fromMap(const Storage &map, QString *errorMessage)
 {
     Project::RestoreResult res = Project::fromMap(map, errorMessage);
     if (res == RestoreResult::Ok) {
diff --git a/src/plugins/python/pythonproject.h b/src/plugins/python/pythonproject.h
index 676e010a015..b4203fa54ad 100644
--- a/src/plugins/python/pythonproject.h
+++ b/src/plugins/python/pythonproject.h
@@ -21,7 +21,7 @@ public:
     bool needsConfiguration() const final { return false; }
 
 private:
-    RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override;
+    RestoreResult fromMap(const Utils::Storage &map, QString *errorMessage) override;
 };
 
 } // Python::Internal
diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
index 1e389870429..c3df267e3b7 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
@@ -152,7 +152,7 @@ void QbsBuildConfiguration::triggerReparseIfActive()
         m_buildSystem->delayParsing();
 }
 
-void QbsBuildConfiguration::fromMap(const QVariantMap &map)
+void QbsBuildConfiguration::fromMap(const Storage &map)
 {
     BuildConfiguration::fromMap(map);
     if (hasError())
diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
index 5984a555b9e..b58da50bb42 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
@@ -71,7 +71,7 @@ signals:
     void qbsConfigurationChanged();
 
 private:
-    void fromMap(const QVariantMap &map) override;
+    void fromMap(const Utils::Storage &map) override;
     void restrictNextBuild(const ProjectExplorer::RunConfiguration *rc) override;
     void triggerReparseIfActive();
 
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 8729e806045..cab1607503b 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -45,7 +45,6 @@ const char QBS_CLEAN_INSTALL_ROOT[] = "Qbs.CleanInstallRoot";
 
 using namespace ProjectExplorer;
 using namespace QtSupport;
-using namespace Tasking;
 using namespace Utils;
 
 namespace QbsProjectManager::Internal {
@@ -352,7 +351,7 @@ int QbsBuildStep::maxJobs() const
     return QThread::idealThreadCount();
 }
 
-void QbsBuildStep::fromMap(const QVariantMap &map)
+void QbsBuildStep::fromMap(const Storage &map)
 {
     BuildStep::fromMap(map);
     if (hasError())
@@ -360,7 +359,7 @@ void QbsBuildStep::fromMap(const QVariantMap &map)
     setQbsConfiguration(map.value(QBS_CONFIG).toMap());
 }
 
-void QbsBuildStep::toMap(QVariantMap &map) const
+void QbsBuildStep::toMap(Storage &map) const
 {
     ProjectExplorer::BuildStep::toMap(map);
     map.insert(QBS_CONFIG, m_qbsConfiguration);
@@ -381,8 +380,9 @@ QbsBuildSystem *QbsBuildStep::qbsBuildSystem() const
     return static_cast<QbsBuildSystem *>(buildSystem());
 }
 
-GroupItem QbsBuildStep::runRecipe()
+Tasking::GroupItem QbsBuildStep::runRecipe()
 {
+    using namespace Tasking;
     const auto onPreParserSetup = [this](QbsRequest &request) {
         request.setParseData(qbsBuildSystem());
     };
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h
index 1e5186a326b..8a4a2b3b6df 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h
@@ -70,8 +70,8 @@ private:
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
     Tasking::GroupItem runRecipe() final;
     QWidget *createConfigWidget() override;
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     QbsBuildConfiguration *qbsBuildConfiguration() const;
     QbsBuildSystem *qbsBuildSystem() const;
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
index 36fcb2ea46b..9d85fb2f73d 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
@@ -187,13 +187,13 @@ QmakeBuildConfiguration::~QmakeBuildConfiguration()
     delete m_buildSystem;
 }
 
-void QmakeBuildConfiguration::toMap(QVariantMap &map) const
+void QmakeBuildConfiguration::toMap(Storage &map) const
 {
     BuildConfiguration::toMap(map);
     map.insert(QLatin1String(BUILD_CONFIGURATION_KEY), int(m_qmakeBuildConfiguration));
 }
 
-void QmakeBuildConfiguration::fromMap(const QVariantMap &map)
+void QmakeBuildConfiguration::fromMap(const Storage &map)
 {
     BuildConfiguration::fromMap(map);
     if (hasError())
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
index a1813e6cd7f..3dca5b9dad8 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
@@ -67,7 +67,7 @@ public:
             QString *arguments, const Utils::FilePath &directory, const QtSupport::QtVersion *version,
             QStringList *outArgs = nullptr);
 
-    void toMap(QVariantMap &map) const override;
+    void toMap(Utils::Storage &map) const override;
 
     BuildType buildType() const override;
 
@@ -99,7 +99,7 @@ signals:
     void useQtQuickCompilerChanged();
 
 protected:
-    void fromMap(const QVariantMap &map) override;
+    void fromMap(const Utils::Storage &map) override;
     bool regenerateBuildFiles(ProjectExplorer::Node *node = nullptr) override;
 
 private:
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index 119cb3669e9..e83dd5a0b7d 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -171,7 +171,7 @@ QmakeProject::~QmakeProject()
     setRootProjectNode(nullptr);
 }
 
-Project::RestoreResult QmakeProject::fromMap(const QVariantMap &map, QString *errorMessage)
+Project::RestoreResult QmakeProject::fromMap(const Storage &map, QString *errorMessage)
 {
     RestoreResult result = Project::fromMap(map, errorMessage);
     if (result != RestoreResult::Ok)
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h
index 3097ae7b579..5d65de04c2f 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.h
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.h
@@ -45,7 +45,7 @@ public:
     ProjectExplorer::ProjectImporter *projectImporter() const final;
 
 protected:
-    RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) final;
+    RestoreResult fromMap(const Utils::Storage &map, QString *errorMessage) final;
 
 private:
     ProjectExplorer::DeploymentKnowledge deploymentKnowledge() const override;
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 893fd5192cb..39c5e0bc63e 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -403,14 +403,14 @@ QString QMakeStep::mkspec() const
     return QmakeKitAspect::effectiveMkspec(target()->kit());
 }
 
-void QMakeStep::toMap(QVariantMap &map) const
+void QMakeStep::toMap(Storage &map) const
 {
     AbstractProcessStep::toMap(map);
     map.insert(QMAKE_FORCED_KEY, m_forced);
     map.insert(QMAKE_SELECTED_ABIS_KEY, m_selectedAbis);
 }
 
-void QMakeStep::fromMap(const QVariantMap &map)
+void QMakeStep::fromMap(const Storage &map)
 {
     m_forced = map.value(QMAKE_FORCED_KEY, false).toBool();
     m_selectedAbis = map.value(QMAKE_SELECTED_ABIS_KEY).toStringList();
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h
index b3177d1f7ae..673838ad7f5 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakestep.h
@@ -124,14 +124,14 @@ public:
     QString makeArguments(const QString &makefile) const;
     QString effectiveQMakeCall() const;
 
-    void toMap(QVariantMap &map) const override;
+    void toMap(Utils::Storage &map) const override;
 
     Utils::SelectionAspect buildType{this};
     ProjectExplorer::ArgumentsAspect userArguments{this};
     Utils::StringAspect effectiveCall{this};
 
 protected:
-    void fromMap(const QVariantMap &map) override;
+    void fromMap(const Utils::Storage &map) override;
 
 private:
     Tasking::GroupItem runRecipe() final;
diff --git a/src/plugins/qmljstools/qmljscodestylepreferences.cpp b/src/plugins/qmljstools/qmljscodestylepreferences.cpp
index b482c18fff9..8556bc649c1 100644
--- a/src/plugins/qmljstools/qmljscodestylepreferences.cpp
+++ b/src/plugins/qmljstools/qmljscodestylepreferences.cpp
@@ -3,6 +3,8 @@
 
 #include "qmljscodestylepreferences.h"
 
+using namespace Utils;
+
 namespace QmlJSTools {
 
 QmlJSCodeStylePreferences::QmlJSCodeStylePreferences(QObject *parent) :
@@ -78,7 +80,7 @@ QVariantMap QmlJSCodeStylePreferences::toMap() const
     return map;
 }
 
-void QmlJSCodeStylePreferences::fromMap(const QVariantMap &map)
+void QmlJSCodeStylePreferences::fromMap(const Storage &map)
 {
     ICodeStylePreferences::fromMap(map);
     if (!currentDelegate())
diff --git a/src/plugins/qmljstools/qmljscodestylepreferences.h b/src/plugins/qmljstools/qmljscodestylepreferences.h
index da52de879d9..db0acc0d738 100644
--- a/src/plugins/qmljstools/qmljscodestylepreferences.h
+++ b/src/plugins/qmljstools/qmljscodestylepreferences.h
@@ -25,8 +25,8 @@ public:
     // tracks parent hierarchy until currentParentSettings is null
     QmlJSCodeStyleSettings currentCodeStyleSettings() const;
 
-    QVariantMap toMap() const override;
-    void fromMap(const QVariantMap &map) override;
+    Utils::Storage toMap() const override;
+    void fromMap(const Utils::Storage &map) override;
 
 public slots:
     void setCodeStyleSettings(const QmlJSCodeStyleSettings &data);
diff --git a/src/plugins/qmljstools/qmljscodestylesettings.cpp b/src/plugins/qmljstools/qmljscodestylesettings.cpp
index 90af4bec52c..7e69a1ee1ac 100644
--- a/src/plugins/qmljstools/qmljscodestylesettings.cpp
+++ b/src/plugins/qmljstools/qmljscodestylesettings.cpp
@@ -19,9 +19,11 @@
 
 static const char lineLengthKey[] = "LineLength";
 
+using namespace Utils;
+
 namespace QmlJSTools {
 
-// ------------------ QmlJSCodeStyleSettingsWidget
+// QmlJSCodeStyleSettings
 
 QmlJSCodeStyleSettings::QmlJSCodeStyleSettings() = default;
 
@@ -32,7 +34,7 @@ QVariantMap QmlJSCodeStyleSettings::toMap() const
     };
 }
 
-void QmlJSCodeStyleSettings::fromMap(const QVariantMap &map)
+void QmlJSCodeStyleSettings::fromMap(const Storage &map)
 {
     lineLength = map.value(lineLengthKey, lineLength).toInt();
 }
diff --git a/src/plugins/qmljstools/qmljscodestylesettings.h b/src/plugins/qmljstools/qmljscodestylesettings.h
index 3b79fe092d0..54cc60c5215 100644
--- a/src/plugins/qmljstools/qmljscodestylesettings.h
+++ b/src/plugins/qmljstools/qmljscodestylesettings.h
@@ -5,7 +5,7 @@
 
 #include "qmljstools_global.h"
 
-#include <QVariantMap>
+#include <utils/storage.h>
 
 #include <optional>
 
@@ -20,8 +20,8 @@ public:
 
     int lineLength = 80;
 
-    QVariantMap toMap() const;
-    void fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    void fromMap(const Utils::Storage &map);
 
     bool equals(const QmlJSCodeStyleSettings &rhs) const;
     bool operator==(const QmlJSCodeStyleSettings &s) const { return equals(s); }
diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp
index ea3edc3542c..6a2cc0e360e 100644
--- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp
+++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp
@@ -70,12 +70,12 @@ void QmlMainFileAspect::addToLayout(Layouting::LayoutItem &parent)
     parent.addItems({Tr::tr("Main QML file:"), m_fileListCombo.data()});
 }
 
-void QmlMainFileAspect::toMap(QVariantMap &map) const
+void QmlMainFileAspect::toMap(Storage &map) const
 {
     map.insert(Constants::QML_MAINSCRIPT_KEY, m_scriptFile);
 }
 
-void QmlMainFileAspect::fromMap(const QVariantMap &map)
+void QmlMainFileAspect::fromMap(const Storage &map)
 {
     m_scriptFile = map.value(Constants::QML_MAINSCRIPT_KEY, M_CURRENT_FILE).toString();
 
diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.h b/src/plugins/qmlprojectmanager/qmlmainfileaspect.h
index bdf9f1d6a38..f71d186e9f7 100644
--- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.h
+++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.h
@@ -43,8 +43,8 @@ public:
     };
 
     void addToLayout(Layouting::LayoutItem &parent) final;
-    void toMap(QVariantMap &map) const final;
-    void fromMap(const QVariantMap &map) final;
+    void toMap(Utils::Storage &map) const final;
+    void fromMap(const Utils::Storage &map) final;
 
     void updateFileComboBox();
     MainScriptSource mainScriptSource() const;
diff --git a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp
index 39c8213e849..cc522c0ae10 100644
--- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp
+++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp
@@ -105,14 +105,14 @@ Utils::FilePath QmlMultiLanguageAspect::databaseFilePath() const
     return m_databaseFilePath;
 }
 
-void QmlMultiLanguageAspect::toMap(QVariantMap &map) const
+void QmlMultiLanguageAspect::toMap(Storage &map) const
 {
     BoolAspect::toMap(map);
     if (!m_currentLocale.isEmpty())
         map.insert(Constants::LAST_USED_LANGUAGE, m_currentLocale);
 }
 
-void QmlMultiLanguageAspect::fromMap(const QVariantMap &map)
+void QmlMultiLanguageAspect::fromMap(const Storage &map)
 {
     BoolAspect::fromMap(map);
     setCurrentLocale(map.value(Constants::LAST_USED_LANGUAGE, "en").toString());
diff --git a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h
index b7188ce13f0..46f86273eaa 100644
--- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h
+++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h
@@ -23,8 +23,8 @@ public:
     QString currentLocale() const;
     void setCurrentLocale(const QString &locale);
     Utils::FilePath databaseFilePath() const;
-    void toMap(QVariantMap &map) const final;
-    void fromMap(const QVariantMap &map) final;
+    void toMap(Utils::Storage &map) const final;
+    void fromMap(const Utils::Storage &map) final;
 
     static QmlMultiLanguageAspect *current();
     static QmlMultiLanguageAspect *current(ProjectExplorer::Project *project);
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index cbc2c9ebd16..24a7120a7bb 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -40,8 +40,10 @@
 
 using namespace Core;
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace QmlProjectManager {
+
 QmlProject::QmlProject(const Utils::FilePath &fileName)
     : Project(QString::fromLatin1(Constants::QMLPROJECT_MIMETYPE), fileName)
 {
@@ -87,7 +89,7 @@ void QmlProject::parsingFinished(const Target *target, bool success)
         openFile(fileToOpen);
 }
 
-Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *errorMessage)
+Project::RestoreResult QmlProject::fromMap(const Storage &map, QString *errorMessage)
 {
     RestoreResult result = Project::fromMap(map, errorMessage);
     if (result != RestoreResult::Ok)
diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index 3a6d5badf79..04629bfe757 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -24,7 +24,7 @@ public:
     ProjectExplorer::Tasks projectIssues(const ProjectExplorer::Kit *k) const final;
 
 protected:
-    RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override;
+    RestoreResult fromMap(const Utils::Storage &map, QString *errorMessage) override;
 
 private:
     ProjectExplorer::DeploymentKnowledge deploymentKnowledge() const override;
diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp
index 8de173e9f37..067245e2368 100644
--- a/src/plugins/qnx/qnxqtversion.cpp
+++ b/src/plugins/qnx/qnxqtversion.cpp
@@ -116,7 +116,7 @@ QVariantMap QnxQtVersion::toMap() const
     return result;
 }
 
-void QnxQtVersion::fromMap(const QVariantMap &map, const Utils::FilePath &)
+void QnxQtVersion::fromMap(const Storage &map, const Utils::FilePath &)
 {
     QtVersion::fromMap(map);
     setSdpPath(FilePath::fromSettings(map.value(SDP_PATH_KEY)));
diff --git a/src/plugins/qnx/qnxqtversion.h b/src/plugins/qnx/qnxqtversion.h
index bcea9b3be3e..04e9d3280d1 100644
--- a/src/plugins/qnx/qnxqtversion.h
+++ b/src/plugins/qnx/qnxqtversion.h
@@ -27,8 +27,8 @@ public:
 
     QString cpuDir() const;
 
-    QVariantMap toMap() const override;
-    void fromMap(const QVariantMap &map, const Utils::FilePath &filePath) override;
+    Utils::Storage toMap() const override;
+    void fromMap(const Utils::Storage &map, const Utils::FilePath &filePath) override;
 
     ProjectExplorer::Abis detectQtAbis() const override;
 
diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp
index a337bb3c51b..7d6af6cce4f 100644
--- a/src/plugins/qnx/qnxsettingspage.cpp
+++ b/src/plugins/qnx/qnxsettingspage.cpp
@@ -74,7 +74,7 @@ public:
     QnxConfiguration() = default;
     explicit QnxConfiguration(const FilePath &envFile) { m_envFile = envFile; }
 
-    void fromMap(const QVariantMap &data)
+    void fromMap(const Storage &data)
     {
         QString envFilePath = data.value(QNXEnvFileKey).toString();
         if (envFilePath.isEmpty())
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 85e0e6af591..5f0929468e4 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -640,7 +640,7 @@ bool QtVersion::hasReleaseBuild() const
     return !d->m_defaultConfigIsDebug || d->m_defaultConfigIsDebugAndRelease;
 }
 
-void QtVersion::fromMap(const QVariantMap &map, const FilePath &filePath)
+void QtVersion::fromMap(const Storage &map, const FilePath &filePath)
 {
     d->m_id = map.value(Constants::QTVERSIONID).toInt();
     if (d->m_id == -1) // this happens on adding from installer, see updateFromInstaller => get a new unique id
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h
index b590d15c28a..52e7822f59e 100644
--- a/src/plugins/qtsupport/baseqtversion.h
+++ b/src/plugins/qtsupport/baseqtversion.h
@@ -5,15 +5,15 @@
 
 #include "qtsupport_global.h"
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/macroexpander.h>
+#include <utils/storage.h>
 
 #include <projectexplorer/abi.h>
 #include <projectexplorer/task.h>
 
 #include <QSet>
 #include <QStringList>
-#include <QVariantMap>
 #include <QVersionNumber>
 
 QT_BEGIN_NAMESPACE
@@ -49,7 +49,7 @@ public:
 
     virtual ~QtVersion();
 
-    virtual void fromMap(const QVariantMap &map, const Utils::FilePath &filePath = {});
+    virtual void fromMap(const Utils::Storage &map, const Utils::FilePath &filePath = {});
     virtual bool equals(QtVersion *other);
 
     bool isAutodetected() const;
@@ -64,7 +64,7 @@ public:
 
     QString type() const;
 
-    virtual QVariantMap toMap() const;
+    virtual Utils::Storage toMap() const;
     virtual bool isValid() const;
     static Predicate isValidPredicate(const Predicate &predicate = {});
     virtual QString invalidReason() const;
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
index 6628d97615e..a3553eb6423 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 QVariantMap &map)
+void AbstractRemoteLinuxDeployStep::fromMap(const Utils::Storage &map)
 {
     BuildStep::fromMap(map);
     if (hasError())
@@ -89,7 +89,7 @@ void AbstractRemoteLinuxDeployStep::fromMap(const QVariantMap &map)
     d->deployTimes.importDeployTimes(map);
 }
 
-void AbstractRemoteLinuxDeployStep::toMap(QVariantMap &map) const
+void AbstractRemoteLinuxDeployStep::toMap(Utils::Storage &map) const
 {
     BuildStep::toMap(map);
     map.insert(d->deployTimes.exportDeployTimes());
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
index 78cfd532041..982c9f596dd 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
@@ -26,8 +26,8 @@ protected:
     void handleStdOutData(const QString &data);
     void handleStdErrData(const QString &data);
 
-    void fromMap(const QVariantMap &map) final;
-    void toMap(QVariantMap &map) const final;
+    void fromMap(const Utils::Storage &map) final;
+    void toMap(Utils::Storage &map) const final;
     bool init() final;
 
     void setInternalInitializer(const std::function<Utils::expected_str<void>()> &init);
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index 8c506772070..1bf020ecb23 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -289,7 +289,7 @@ GroupItem GenericDirectUploadStep::deployRecipe()
 
     const TreeStorage<UploadStorage> storage;
     const Group root {
-        Storage(storage),
+        Tasking::Storage(storage),
         statTree(storage, preFilesToStat, preStatEndHandler),
         uploadTask(storage),
         Group {
diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index b001fb8654f..9eb44b8f00c 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -221,7 +221,7 @@ GroupItem GenericLinuxDeviceTesterPrivate::transferTasks() const
     TreeStorage<TransferStorage> storage;
     return Group {
         continueOnDone,
-        Storage(storage),
+        Tasking::Storage(storage),
         transferTask(FileTransferMethod::GenericCopy, storage),
         transferTask(FileTransferMethod::Sftp, storage),
         transferTask(FileTransferMethod::Rsync, storage),
diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp
index 7556ad9947e..f13aecd7ab7 100644
--- a/src/plugins/remotelinux/makeinstallstep.cpp
+++ b/src/plugins/remotelinux/makeinstallstep.cpp
@@ -38,7 +38,7 @@ public:
     MakeInstallStep(BuildStepList *parent, Id id);
 
 private:
-    void fromMap(const QVariantMap &map) override;
+    void fromMap(const Storage &map) override;
     QWidget *createConfigWidget() override;
     bool init() override;
     Tasking::GroupItem runRecipe() final;
@@ -257,7 +257,7 @@ void MakeInstallStep::updateFromCustomCommandLineAspect()
     setUserArguments(ProcessArgs::joinArgs(tokens.mid(1)));
 }
 
-void MakeInstallStep::fromMap(const QVariantMap &map)
+void MakeInstallStep::fromMap(const Storage &map)
 {
     MakeStep::fromMap(map);
     if (hasError())
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
index d94857c4d66..e16b07ee06e 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
@@ -99,7 +99,7 @@ QString RemoteLinuxEnvironmentAspect::userEnvironmentChangesAsString() const
     return env.mid(0, env.size() - 1);
 }
 
-void RemoteLinuxEnvironmentAspect::fromMap(const QVariantMap &map)
+void RemoteLinuxEnvironmentAspect::fromMap(const Storage &map)
 {
     ProjectExplorer::EnvironmentAspect::fromMap(map);
 
@@ -117,7 +117,7 @@ void RemoteLinuxEnvironmentAspect::fromMap(const QVariantMap &map)
     }
 }
 
-void RemoteLinuxEnvironmentAspect::toMap(QVariantMap &map) const
+void RemoteLinuxEnvironmentAspect::toMap(Storage &map) const
 {
     ProjectExplorer::EnvironmentAspect::toMap(map);
     map.insert(QLatin1String(VERSION_KEY), ENVIRONMENTASPECT_VERSION);
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.h b/src/plugins/remotelinux/remotelinuxenvironmentaspect.h
index 9041f68c5c6..be47bb489ce 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.h
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.h
@@ -21,8 +21,8 @@ public:
     QString userEnvironmentChangesAsString() const;
 
 protected:
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
 private:
     Utils::Environment m_remoteEnvironment;
diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp
index 4a3720d8c85..5fd83665c70 100644
--- a/src/plugins/remotelinux/tarpackagecreationstep.cpp
+++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp
@@ -25,7 +25,6 @@
 #include <cstring>
 
 using namespace ProjectExplorer;
-using namespace Tasking;
 using namespace Utils;
 
 namespace RemoteLinux::Internal {
@@ -61,9 +60,9 @@ public:
 
 private:
     bool init() final;
-    GroupItem runRecipe() final;
-    void fromMap(const QVariantMap &map) final;
-    void toMap(QVariantMap &map) const final;
+    Tasking::GroupItem runRecipe() final;
+    void fromMap(const Storage &map) final;
+    void toMap(Storage &map) const final;
     QVariant data(Id id) const final;
 
     void raiseError(const QString &errorMessage);
@@ -129,8 +128,9 @@ bool TarPackageCreationStep::init()
     return true;
 }
 
-GroupItem TarPackageCreationStep::runRecipe()
+Tasking::GroupItem TarPackageCreationStep::runRecipe()
 {
+    using namespace Tasking;
     const auto onSetup = [this](Async<void> &async) {
         const QList<DeployableFile> &files = target()->deploymentData().allFiles();
         if (m_incrementalDeployment()) {
@@ -166,7 +166,7 @@ GroupItem TarPackageCreationStep::runRecipe()
     return AsyncTask<void>(onSetup, onDone, onError);
 }
 
-void TarPackageCreationStep::fromMap(const QVariantMap &map)
+void TarPackageCreationStep::fromMap(const Storage &map)
 {
     BuildStep::fromMap(map);
     if (hasError())
@@ -174,7 +174,7 @@ void TarPackageCreationStep::fromMap(const QVariantMap &map)
     m_deployTimes.importDeployTimes(map);
 }
 
-void TarPackageCreationStep::toMap(QVariantMap &map) const
+void TarPackageCreationStep::toMap(Storage &map) const
 {
     BuildStep::toMap(map);
     map.insert(m_deployTimes.exportDeployTimes());
diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp
index 27f1d7ca43b..98f0cfdde90 100644
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -201,7 +201,7 @@ SubversionDiffEditorController::SubversionDiffEditorController(IDocument *docume
     };
 
     const Group root {
-        Storage(diffInputStorage),
+        Tasking::Storage(diffInputStorage),
         parallel,
         Group {
             finishAllAndDone,
diff --git a/src/plugins/texteditor/behaviorsettings.cpp b/src/plugins/texteditor/behaviorsettings.cpp
index 635ddea0a23..83e0695383b 100644
--- a/src/plugins/texteditor/behaviorsettings.cpp
+++ b/src/plugins/texteditor/behaviorsettings.cpp
@@ -18,6 +18,8 @@ static const char keyboardTooltips[] = "KeyboardTooltips";
 static const char groupPostfix[] = "BehaviorSettings";
 static const char smartSelectionChanging[] = "SmartSelectionChanging";
 
+using namespace Utils;
+
 namespace TextEditor {
 
 BehaviorSettings::BehaviorSettings() :
@@ -55,7 +57,7 @@ QVariantMap BehaviorSettings::toMap() const
     };
 }
 
-void BehaviorSettings::fromMap(const QVariantMap &map)
+void BehaviorSettings::fromMap(const Storage &map)
 {
     m_mouseHiding = map.value(mouseHidingKey, m_mouseHiding).toBool();
     m_mouseNavigation = map.value(mouseNavigationKey, m_mouseNavigation).toBool();
diff --git a/src/plugins/texteditor/behaviorsettings.h b/src/plugins/texteditor/behaviorsettings.h
index ec4746c6115..06a7830dc4b 100644
--- a/src/plugins/texteditor/behaviorsettings.h
+++ b/src/plugins/texteditor/behaviorsettings.h
@@ -5,7 +5,7 @@
 
 #include "texteditor_global.h"
 
-#include <QVariantMap>
+#include <utils/storage.h>
 
 namespace TextEditor {
 
@@ -21,8 +21,8 @@ public:
     void toSettings(const QString &category) const;
     void fromSettings(const QString &category);
 
-    QVariantMap toMap() const;
-    void fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    void fromMap(const Utils::Storage &map);
 
     bool equals(const BehaviorSettings &bs) const;
 
diff --git a/src/plugins/texteditor/extraencodingsettings.cpp b/src/plugins/texteditor/extraencodingsettings.cpp
index 638f749d7e0..216dcae524e 100644
--- a/src/plugins/texteditor/extraencodingsettings.cpp
+++ b/src/plugins/texteditor/extraencodingsettings.cpp
@@ -14,6 +14,8 @@
 static const char kGroupPostfix[] = "EditorManager";
 static const char kUtf8BomBehaviorKey[] = "Utf8BomBehavior";
 
+using namespace Utils;
+
 namespace TextEditor {
 
 ExtraEncodingSettings::ExtraEncodingSettings() : m_utf8BomSetting(OnlyKeep)
@@ -43,7 +45,7 @@ QVariantMap ExtraEncodingSettings::toMap() const
     };
 }
 
-void ExtraEncodingSettings::fromMap(const QVariantMap &map)
+void ExtraEncodingSettings::fromMap(const Storage &map)
 {
     m_utf8BomSetting = (Utf8BomSetting)map.value(kUtf8BomBehaviorKey, m_utf8BomSetting).toInt();
 }
diff --git a/src/plugins/texteditor/extraencodingsettings.h b/src/plugins/texteditor/extraencodingsettings.h
index 8f905e7a942..b9109d1b64c 100644
--- a/src/plugins/texteditor/extraencodingsettings.h
+++ b/src/plugins/texteditor/extraencodingsettings.h
@@ -5,7 +5,7 @@
 
 #include "texteditor_global.h"
 
-#include <QVariantMap>
+#include <utils/storage.h>
 
 namespace TextEditor {
 
@@ -18,8 +18,8 @@ public:
     void toSettings(const QString &category) const;
     void fromSettings(const QString &category);
 
-    QVariantMap toMap() const;
-    void fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    void fromMap(const Utils::Storage &map);
 
     bool equals(const ExtraEncodingSettings &s) const;
 
diff --git a/src/plugins/texteditor/icodestylepreferences.cpp b/src/plugins/texteditor/icodestylepreferences.cpp
index 1d92095d5a3..b3aa668ccae 100644
--- a/src/plugins/texteditor/icodestylepreferences.cpp
+++ b/src/plugins/texteditor/icodestylepreferences.cpp
@@ -9,7 +9,7 @@
 
 #include <utils/settingsutils.h>
 
-using namespace TextEditor;
+using namespace Utils;
 
 static const char currentPreferencesKey[] = "CurrentPreferences";
 
@@ -222,14 +222,14 @@ void ICodeStylePreferences::fromSettings(const QString &category)
     Utils::fromSettings(d->m_settingsSuffix, category, Core::ICore::settings(), this);
 }
 
-QVariantMap ICodeStylePreferences::toMap() const
+Storage ICodeStylePreferences::toMap() const
 {
     if (!currentDelegate())
         return d->m_tabSettings.toMap();
     return {{currentPreferencesKey, currentDelegateId()}};
 }
 
-void ICodeStylePreferences::fromMap(const QVariantMap &map)
+void ICodeStylePreferences::fromMap(const Storage &map)
 {
     d->m_tabSettings.fromMap(map);
     const QByteArray delegateId = map.value(currentPreferencesKey).toByteArray();
diff --git a/src/plugins/texteditor/icodestylepreferences.h b/src/plugins/texteditor/icodestylepreferences.h
index 329e7eb4e5d..772c712e31d 100644
--- a/src/plugins/texteditor/icodestylepreferences.h
+++ b/src/plugins/texteditor/icodestylepreferences.h
@@ -5,6 +5,8 @@
 
 #include "texteditor_global.h"
 
+#include <utils/storage.h>
+
 #include <QObject>
 
 QT_BEGIN_NAMESPACE
@@ -67,8 +69,8 @@ public:
     void fromSettings(const QString &category);
 
     // make below 2 protected?
-    virtual QVariantMap toMap() const;
-    virtual void fromMap(const QVariantMap &map);
+    virtual Utils::Storage toMap() const;
+    virtual void fromMap(const Utils::Storage &map);
 
 signals:
     void tabSettingsChanged(const TextEditor::TabSettings &settings);
diff --git a/src/plugins/texteditor/marginsettings.cpp b/src/plugins/texteditor/marginsettings.cpp
index 8e58e012b8d..3f832b04e39 100644
--- a/src/plugins/texteditor/marginsettings.cpp
+++ b/src/plugins/texteditor/marginsettings.cpp
@@ -4,8 +4,6 @@
 #include "marginsettings.h"
 
 #include <QSettings>
-#include <QString>
-#include <QVariantMap>
 
 static const char showWrapColumnKey[] = "ShowMargin";
 static const char wrapColumnKey[] = "MarginColumn";
@@ -13,7 +11,9 @@ static const char groupPostfix[] = "textMarginSettings";
 static const char useIndenterColumnKey[] = "UseIndenter";
 static const char tintMarginAreaColumnKey[] = "tintMarginArea";
 
-using namespace TextEditor;
+using namespace Utils;
+
+namespace TextEditor {
 
 MarginSettings::MarginSettings()
     : m_showMargin(false)
@@ -45,7 +45,7 @@ void MarginSettings::fromSettings(QSettings *s)
     s->endGroup();
 }
 
-QVariantMap MarginSettings::toMap() const
+Storage MarginSettings::toMap() const
 {
     return {
         {tintMarginAreaColumnKey, m_tintMarginArea},
@@ -55,7 +55,7 @@ QVariantMap MarginSettings::toMap() const
     };
 }
 
-void MarginSettings::fromMap(const QVariantMap &map)
+void MarginSettings::fromMap(const Storage &map)
 {
     m_showMargin = map.value(showWrapColumnKey, m_showMargin).toBool();
     m_tintMarginArea = map.value(tintMarginAreaColumnKey, m_tintMarginArea).toBool();
@@ -71,3 +71,5 @@ bool MarginSettings::equals(const MarginSettings &other) const
         && m_marginColumn == other.m_marginColumn
         ;
 }
+
+} // TextEditor
diff --git a/src/plugins/texteditor/marginsettings.h b/src/plugins/texteditor/marginsettings.h
index e98093042fb..78fc822e687 100644
--- a/src/plugins/texteditor/marginsettings.h
+++ b/src/plugins/texteditor/marginsettings.h
@@ -5,7 +5,7 @@
 
 #include "texteditor_global.h"
 
-#include <QVariantMap>
+#include <utils/storage.h>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
@@ -21,8 +21,8 @@ public:
     void toSettings(QSettings *s) const;
     void fromSettings(QSettings *s);
 
-    QVariantMap toMap() const;
-    void fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    void fromMap(const Utils::Storage &map);
 
     bool equals(const MarginSettings &other) const;
 
diff --git a/src/plugins/texteditor/storagesettings.cpp b/src/plugins/texteditor/storagesettings.cpp
index adaf0be1030..34ecc8f67bd 100644
--- a/src/plugins/texteditor/storagesettings.cpp
+++ b/src/plugins/texteditor/storagesettings.cpp
@@ -11,6 +11,8 @@
 #include <QRegularExpression>
 #include <QString>
 
+using namespace Utils;
+
 namespace TextEditor {
 
 static const char cleanWhitespaceKey[] = "cleanWhitespace";
@@ -43,7 +45,7 @@ void StorageSettings::fromSettings(const QString &category)
     Utils::fromSettings(QLatin1String(groupPostfix), category, Core::ICore::settings(), this);
 }
 
-QVariantMap StorageSettings::toMap() const
+Storage StorageSettings::toMap() const
 {
     return {
         {cleanWhitespaceKey, m_cleanWhitespace},
@@ -55,7 +57,7 @@ QVariantMap StorageSettings::toMap() const
     };
 }
 
-void StorageSettings::fromMap(const QVariantMap &map)
+void StorageSettings::fromMap(const Storage &map)
 {
     m_cleanWhitespace = map.value(cleanWhitespaceKey, m_cleanWhitespace).toBool();
     m_inEntireDocument = map.value(inEntireDocumentKey, m_inEntireDocument).toBool();
diff --git a/src/plugins/texteditor/storagesettings.h b/src/plugins/texteditor/storagesettings.h
index 522c1039172..85a88a022f3 100644
--- a/src/plugins/texteditor/storagesettings.h
+++ b/src/plugins/texteditor/storagesettings.h
@@ -5,7 +5,7 @@
 
 #include "texteditor_global.h"
 
-#include <QVariantMap>
+#include <utils/storage.h>
 
 namespace TextEditor {
 
@@ -17,8 +17,8 @@ public:
     void toSettings(const QString &category) const;
     void fromSettings(const QString &category);
 
-    QVariantMap toMap() const;
-    void fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    void fromMap(const Utils::Storage &map);
 
     // calculated based on boolean setting plus file type blacklist examination
     bool removeTrailingWhitespace(const QString &filePattern) const;
diff --git a/src/plugins/texteditor/tabsettings.cpp b/src/plugins/texteditor/tabsettings.cpp
index 07660a55475..3fb2839adc2 100644
--- a/src/plugins/texteditor/tabsettings.cpp
+++ b/src/plugins/texteditor/tabsettings.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "tabsettings.h"
-#include "texteditorplugin.h"
 
 #include <utils/settingsutils.h>
 
@@ -19,6 +18,8 @@ static const char indentSizeKey[] = "IndentSize";
 static const char groupPostfix[] = "TabSettings";
 static const char paddingModeKey[] = "PaddingMode";
 
+using namespace Utils;
+
 namespace TextEditor {
 
 TabSettings::TabSettings(TabSettings::TabPolicy tabPolicy,
@@ -55,7 +56,7 @@ QVariantMap TabSettings::toMap() const
     };
 }
 
-void TabSettings::fromMap(const QVariantMap &map)
+void TabSettings::fromMap(const Storage &map)
 {
     const bool spacesForTabs = map.value(spacesForTabsKey, true).toBool();
     const bool autoSpacesForTabs = map.value(autoSpacesForTabsKey, false).toBool();
diff --git a/src/plugins/texteditor/tabsettings.h b/src/plugins/texteditor/tabsettings.h
index e21ab9678b9..07512d6af37 100644
--- a/src/plugins/texteditor/tabsettings.h
+++ b/src/plugins/texteditor/tabsettings.h
@@ -5,6 +5,8 @@
 
 #include "texteditor_global.h"
 
+#include <utils/storage.h>
+
 #include <QTextBlock>
 
 QT_BEGIN_NAMESPACE
@@ -39,8 +41,8 @@ public:
     void toSettings(const QString &category, QSettings *s) const;
     void fromSettings(const QString &category, QSettings *s);
 
-    QVariantMap toMap() const;
-    void fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    void fromMap(const Utils::Storage &map);
 
     int lineIndentPosition(const QString &text) const;
     int columnAt(const QString &text, int position) const;
diff --git a/src/plugins/texteditor/typingsettings.cpp b/src/plugins/texteditor/typingsettings.cpp
index 83bbb800222..7956f7c291c 100644
--- a/src/plugins/texteditor/typingsettings.cpp
+++ b/src/plugins/texteditor/typingsettings.cpp
@@ -16,6 +16,7 @@ static const char smartBackspaceBehaviorKey[] = "SmartBackspaceBehavior";
 static const char preferSingleLineCommentsKey[] = "PreferSingleLineComments";
 static const char groupPostfix[] = "TypingSettings";
 
+using namespace Utils;
 
 namespace TextEditor {
 
@@ -38,7 +39,7 @@ void TypingSettings::fromSettings(const QString &category)
     Utils::fromSettings(QLatin1String(groupPostfix), category, Core::ICore::settings(), this);
 }
 
-QVariantMap TypingSettings::toMap() const
+Storage TypingSettings::toMap() const
 {
     return {
         {autoIndentKey, m_autoIndent},
@@ -48,7 +49,7 @@ QVariantMap TypingSettings::toMap() const
     };
 }
 
-void TypingSettings::fromMap(const QVariantMap &map)
+void TypingSettings::fromMap(const Storage &map)
 {
     m_autoIndent = map.value(autoIndentKey, m_autoIndent).toBool();
     m_tabKeyBehavior = (TabKeyBehavior) map.value(tabKeyBehaviorKey, m_tabKeyBehavior).toInt();
diff --git a/src/plugins/texteditor/typingsettings.h b/src/plugins/texteditor/typingsettings.h
index 03d3989b814..2ad06a23ab5 100644
--- a/src/plugins/texteditor/typingsettings.h
+++ b/src/plugins/texteditor/typingsettings.h
@@ -5,7 +5,7 @@
 
 #include "texteditor_global.h"
 
-#include <QVariantMap>
+#include <utils/storage.h>
 
 QT_BEGIN_NAMESPACE
 class QTextDocument;
@@ -38,8 +38,8 @@ public:
     void toSettings(const QString &category) const;
     void fromSettings(const QString &category);
 
-    QVariantMap toMap() const;
-    void fromMap(const QVariantMap &map);
+    Utils::Storage toMap() const;
+    void fromMap(const Utils::Storage &map);
 
     bool equals(const TypingSettings &ts) const;
 
diff --git a/src/plugins/valgrind/valgrindsettings.cpp b/src/plugins/valgrind/valgrindsettings.cpp
index 6c23677face..f02343ff158 100644
--- a/src/plugins/valgrind/valgrindsettings.cpp
+++ b/src/plugins/valgrind/valgrindsettings.cpp
@@ -146,12 +146,12 @@ void SuppressionAspect::addToLayout(Layouting::LayoutItem &parent)
     parent.addItem(Span { 2, group });
 }
 
-void SuppressionAspect::fromMap(const QVariantMap &map)
+void SuppressionAspect::fromMap(const Storage &map)
 {
     BaseAspect::fromMap(map); // FIXME Looks wrong, as it skips the intermediate level
 }
 
-void SuppressionAspect::toMap(QVariantMap &map) const
+void SuppressionAspect::toMap(Storage &map) const
 {
     BaseAspect::toMap(map);
 }
diff --git a/src/plugins/valgrind/valgrindsettings.h b/src/plugins/valgrind/valgrindsettings.h
index b9de99db05b..b0c2c670153 100644
--- a/src/plugins/valgrind/valgrindsettings.h
+++ b/src/plugins/valgrind/valgrindsettings.h
@@ -22,8 +22,8 @@ public:
 
     void addToLayout(Layouting::LayoutItem &parent) final;
 
-    void fromMap(const QVariantMap &map) final;
-    void toMap(QVariantMap &map) const final;
+    void fromMap(const Utils::Storage &map) final;
+    void toMap(Utils::Storage &map) const final;
 
     void addSuppressionFile(const Utils::FilePath &suppressionFile);
 
diff --git a/src/plugins/webassembly/webassemblyrunconfiguration.cpp b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
index a1bb735c3c3..02cbcd7d53d 100644
--- a/src/plugins/webassembly/webassemblyrunconfiguration.cpp
+++ b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
@@ -144,13 +144,13 @@ public:
         parent.addItems({Tr::tr("Web browser:"), m_webBrowserComboBox});
     }
 
-    void fromMap(const QVariantMap &map) override
+    void fromMap(const Storage &map) override
     {
         if (!m_availableBrowsers.isEmpty())
             m_currentBrowser = map.value(BROWSER_KEY, m_availableBrowsers.first().first).toString();
     }
 
-    void toMap(QVariantMap &map) const override
+    void toMap(Storage &map) const override
     {
         map.insert(BROWSER_KEY, m_currentBrowser);
     }