smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6731 from symless/issue-6730-update-config

Browse source 
Changed user scope setting location back
This commit is contained in:
Jnewbon 2020-07-22 10:32:31 +01:00 committed by GitHub
commit 6991e908f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
v1.12.0-rc2
===========
Bug fixes:
- #6730 Updating synergy looses settings
v1.12.0-rc1 v1.12.0-rc1
=========== ===========

2
cmake/Version.cmake
View file

@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.4)
set (SYNERGY_VERSION_MAJOR 1) set (SYNERGY_VERSION_MAJOR 1)
set (SYNERGY_VERSION_MINOR 12) set (SYNERGY_VERSION_MINOR 12)
set (SYNERGY_VERSION_PATCH 0) set (SYNERGY_VERSION_PATCH 0)
set (SYNERGY_VERSION_STAGE "rc1") set (SYNERGY_VERSION_STAGE "rc2")
# #
# Version from CI # Version from CI

7
src/gui/src/ConfigWriter.cpp
View file

@ -51,9 +51,10 @@ namespace GUI {
QCoreApplication::organizationName(), QCoreApplication::organizationName(),
QCoreApplication::applicationName()); QCoreApplication::applicationName());
m_pSettingsUser = new QSettings(QSettings::Scope::UserScope, //defaults to user scope, if we set the scope specifically then we also have to set
QCoreApplication::organizationName(), // the application name and the organisation name which breaks backwards compatibility
QCoreApplication::applicationName()); // See #6730
m_pSettingsUser = new QSettings();
//Set scope to user for initially //Set scope to user for initially
m_pSettingsCurrent = m_pSettingsUser; m_pSettingsCurrent = m_pSettingsUser;