diff options
author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-06-29 13:10:39 (GMT) |
---|---|---|
committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-06-29 13:10:39 (GMT) |
commit | 497fd44414dea6314731b96869e2d49bb8b439b5 (patch) | |
tree | 1a5e1f531c340e3f2cc0c1020ee10b22a57a1a56 /src/corelib/io | |
parent | 0a852d51c6d74712cda8c7d08da4f5c90d99d5cd (diff) | |
download | Qt-497fd44414dea6314731b96869e2d49bb8b439b5.zip Qt-497fd44414dea6314731b96869e2d49bb8b439b5.tar.gz Qt-497fd44414dea6314731b96869e2d49bb8b439b5.tar.bz2 |
Doc: QSettings::sync() imports changes made by other processes.
Task-number: QTBUG-5949
Reviewed-by: Morten Engvoldsen
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qsettings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 64015ce..f802412 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -2274,9 +2274,9 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile, be different instances of your application running at the same time or different applications altogether) to read and write to the same system locations. It uses advisory file locking and a - smart merging algorithm to ensure data integrity. Changes - performed by another process aren't visible in the current - process until sync() is called. + smart merging algorithm to ensure data integrity. Note that sync() + imports changes made by other processes (in addition to writing + the changes from this QSettings). \section1 Platform-Specific Notes |