Merge pull request #15926 from sledgehammer999/fix_migration

Correct the order of the migrated settings' mappings

src/app/upgrade.cpp

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