diff options
| author | hjk <hjk@qt.io> | 2023-08-25 15:38:03 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2023-08-29 12:28:57 +0000 |
| commit | 52d1cd47cb3f6689e39283dcf08ea6c4d28b9eba (patch) | |
| tree | 78a1185410b87cc73dad0109a27b0cffcce9e153 /src/libs/utils/settingsaccessor.cpp | |
| parent | e5afe02556849ccc314f275f8dff2edd3ba65cf5 (diff) | |
Utils: Write Key/Store to settings
We claim that we still store QVariantMap to keep the format unchanged.
Change-Id: Ie7b0a83febfeb2cb3cfc9ee42b8423453cf3b1c4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Diffstat (limited to 'src/libs/utils/settingsaccessor.cpp')
| -rw-r--r-- | src/libs/utils/settingsaccessor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp index 3bd6f227e3..1c9f30ecba 100644 --- a/src/libs/utils/settingsaccessor.cpp +++ b/src/libs/utils/settingsaccessor.cpp @@ -387,7 +387,7 @@ Store VersionUpgrader::renameKeys(const QList<Change> &changes, Store map) const Store::iterator i = map.begin(); while (i != map.end()) { QVariant v = i.value(); - if (v.type() == QVariant::Map) + if (Utils::isStore(v)) i.value() = variantFromStore(renameKeys(changes, storeFromVariant(v))); ++i; @@ -717,7 +717,7 @@ static QVariant mergeQVariantMapsRecursion(const Store &mainTree, const Store &s QPair<Key, QVariant> kv = mergeResult.value(); - if (kv.second.type() == QVariant::Map) { + if (Utils::isStore(kv.second)) { const Key newKeyPrefix = keyPrefix + kv.first + '/'; kv.second = mergeQVariantMapsRecursion(mainTree, secondaryTree, newKeyPrefix, storeFromVariant(kv.second), |