From 76bff18857a0fc356e355735004cb746434d0251 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 20 Jul 2020 13:39:59 +0100 Subject: [PATCH] #6730 Changed user scope settings location for backwards compatibility Signed-off-by: Jamie Newbon --- cmake/Version.cmake | 2 +- src/gui/src/ConfigWriter.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 20cc9fe11..a7c686f51 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.4) set (SYNERGY_VERSION_MAJOR 1) set (SYNERGY_VERSION_MINOR 12) set (SYNERGY_VERSION_PATCH 0) -set (SYNERGY_VERSION_STAGE "rc1") +set (SYNERGY_VERSION_STAGE "snapshot") # # Version from CI diff --git a/src/gui/src/ConfigWriter.cpp b/src/gui/src/ConfigWriter.cpp index 0a98003da..6e039170e 100644 --- a/src/gui/src/ConfigWriter.cpp +++ b/src/gui/src/ConfigWriter.cpp @@ -51,9 +51,10 @@ namespace GUI { QCoreApplication::organizationName(), QCoreApplication::applicationName()); - m_pSettingsUser = new QSettings(QSettings::Scope::UserScope, - QCoreApplication::organizationName(), - QCoreApplication::applicationName()); + //defaults to user scope, if we set the scope specifically then we also have to set + // the application name and the organisation name which breaks backwards compatibility + // See #6730 + m_pSettingsUser = new QSettings(); //Set scope to user for initially m_pSettingsCurrent = m_pSettingsUser;