diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-19 15:54:46 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-19 15:54:46 (GMT) |
commit | e9dec649afc2e513354c79f6e38ca53b6943cccc (patch) | |
tree | c3947491e089a1d1d82148481c80ab4e46a49741 /src/corelib/io/qsettings.cpp | |
parent | 92b47ba61809de30eed205e7d1eafb1cde1087e1 (diff) | |
parent | 90b4f0ca7b9fe21f6c4b39a80f8f9cf98626690a (diff) | |
download | Qt-e9dec649afc2e513354c79f6e38ca53b6943cccc.zip Qt-e9dec649afc2e513354c79f6e38ca53b6943cccc.tar.gz Qt-e9dec649afc2e513354c79f6e38ca53b6943cccc.tar.bz2 |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/io/qsettings.cpp')
-rw-r--r-- | src/corelib/io/qsettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 484e79a..14fc2d4 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -2295,7 +2295,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile, As mentioned in the \l{Fallback Mechanism} section, QSettings stores settings for an application in up to four locations, depending on whether the settings are user-specific or - system-wide and whether the the settings are application-specific + system-wide and whether the settings are application-specific or organization-wide. For simplicity, we're assuming the organization is called MySoft and the application is called Star Runner. |