summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2014-09-02 06:26:13 +0300
committerOrgad Shaneh <orgads@gmail.com>2014-09-02 21:08:25 +0200
commit215dec23a4d1ca47d59eae220e43eea50491d54f (patch)
tree586b212bbcf4099d65a65671274f71dac8e66e00 /src
parent0f253e48bf0baee099bcec69e58e1ebc83a85b6d (diff)
downloadqt-creator-215dec23a4d1ca47d59eae220e43eea50491d54f.tar.gz
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>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/projectexplorer/settingsaccessor.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp
index ca373f3f11..60d2ab1880 100644
--- a/src/plugins/projectexplorer/settingsaccessor.cpp
+++ b/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())