diff -r 5dc02b23752f -r 3e2da88830cd src/corelib/io/qsettings.cpp --- a/src/corelib/io/qsettings.cpp Tue Jul 06 15:10:48 2010 +0300 +++ b/src/corelib/io/qsettings.cpp Wed Aug 18 10:37:55 2010 +0300 @@ -2274,9 +2274,9 @@ 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