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

#6730 Changed user scope settings location for backwards compatibility

Browse source 
Signed-off-by: Jamie Newbon <jamie@symless.com>
This commit is contained in:
Jamie Newbon 2020-07-20 13:39:59 +01:00
parent 36984104ec
commit 76bff18857
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/Version.cmake
View file

@ -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

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

@ -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;