Merge pull request #15926 from sledgehammer999/fix_migration

Correct the order of the migrated settings' mappings
This commit is contained in:
sledgehammer999 2022-01-06 14:46:48 +02:00 committed by GitHub
commit 9b61991523
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -233,8 +233,8 @@ namespace
{ {
struct KeyMapping struct KeyMapping
{ {
QString oldKey;
QString newKey; QString newKey;
QString oldKey;
}; };
const KeyMapping mappings[] = const KeyMapping mappings[] =
@ -322,7 +322,7 @@ namespace
{ {
const auto value = settingsStorage->loadValue<QVariant>(mapping.oldKey); const auto value = settingsStorage->loadValue<QVariant>(mapping.oldKey);
settingsStorage->storeValue(mapping.newKey, value); settingsStorage->storeValue(mapping.newKey, value);
settingsStorage->removeValue(mapping.oldKey); // TODO: Remove oldKey after ~v4.4.3 and bump migration version
} }
} }
} }