projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
19dd656
)
Old Qt: Another build fix
author
Markus Goetz
<markus@woboq.com>
Tue, 7 Feb 2017 17:54:40 +0000
(18:54 +0100)
committer
Markus Goetz
<markus@woboq.com>
Tue, 7 Feb 2017 17:54:40 +0000
(18:54 +0100)
src/gui/generalsettings.cpp
patch
|
blob
|
history
diff --git
a/src/gui/generalsettings.cpp
b/src/gui/generalsettings.cpp
index c4474b5e21dd810dcee1c447603d8b9bdc79e0b9..9a9722a489bdb647e52f99070b7f0810821678be 100644
(file)
--- a/
src/gui/generalsettings.cpp
+++ b/
src/gui/generalsettings.cpp
@@
-104,7
+104,11
@@
QSize GeneralSettings::sizeHint() const {
void GeneralSettings::loadMiscSettings()
{
+#if QT_VERSION < QT_VERSION_CHECK( 5, 4, 0 )
+ QScopedValueRollback<bool> scope(_currentlyLoading);
+#else
QScopedValueRollback<bool> scope(_currentlyLoading, true);
+#endif
ConfigFile cfgFile;
_ui->monoIconsCheckBox->setChecked(cfgFile.monoIcons());
_ui->desktopNotificationsCheckBox->setChecked(cfgFile.optionalDesktopNotifications());