From 76bff18857a0fc356e355735004cb746434d0251 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 20 Jul 2020 13:39:59 +0100 Subject: [PATCH 1/3] #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; From 86bce735d2aa5492d538bd635b3c08f35e36b8f4 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 21 Jul 2020 16:53:33 +0100 Subject: [PATCH 2/3] #6730 Set stage back Signed-off-by: Jamie Newbon --- cmake/Version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index a7c686f51..20cc9fe11 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 "snapshot") +set (SYNERGY_VERSION_STAGE "rc1") # # Version from CI From 91e6df0966fc8d45f029f530e272e003f02715eb Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 21 Jul 2020 16:56:38 +0100 Subject: [PATCH 3/3] #6730 Updated ChangeLog Signed-off-by: Jamie Newbon --- ChangeLog | 6 ++++++ cmake/Version.cmake | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 58d2e7d58..7fe8e2aca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +v1.12.0-rc2 +=========== + +Bug fixes: +- #6730 Updating synergy looses settings + v1.12.0-rc1 =========== diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 20cc9fe11..0f30781b0 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 "rc2") # # Version from CI