SettingsAccessor: Fix discarding user sticky settings on 3.1->3.2 upgrade

... when both the shared and the user file are older than 3.2.

Change-Id: I9e16d67c2b566c43060cb9e05f02ea3a5343065f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

src/plugins/projectexplorer/settingsaccessor.cpp

@@ -637,6 +637,11 @@ QVariantMap SettingsAccessor::upgradeSettings(const QVariantMap &data, int toVer
     else
         result = data;
 
+    if (version < 15 && toVersion < 15) {
+        result.insert(QLatin1String(USER_STICKY_KEYS_KEY),
+                      data.value(QLatin1String("ProjectExplorer.Project.UserStickyKeys")));
+    }
+
     if (version >= toVersion
             || version < d->firstVersion()
             || toVersion > d->currentVersion())