summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Astals Cid <albert.astals@canonical.com>2016-11-23 11:13:48 +0100
committerAlbert Astals Cid <albert.astals@canonical.com>2016-11-29 15:42:25 +0000
commit1155ca10f8e329d253f7dd58dad396321116798c (patch)
tree89b45c02b1cfe0d193f2e72588b728c5c9cb716e
parent4c375f75e0ed38d297dc44746e2e00f34f98269b (diff)
QSettings: Avoid unneeded sync() on destruction
... if sync() has already been called manually. Change-Id: I11bd6810aa3c1065a72ffaa2001d1bdbf8bf9c89 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/io/qsettings.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 480a777457..8c67d97afa 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -2705,6 +2705,7 @@ void QSettings::sync()
{
Q_D(QSettings);
d->sync();
+ d->pendingChanges = false;
}
/*!