From 215dec23a4d1ca47d59eae220e43eea50491d54f Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 2 Sep 2014 06:26:13 +0300
Subject: 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 | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/plugins')

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())
-- 
cgit v1.2.1