diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-05 15:44:22 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-05 15:44:22 +0200 |
| commit | 248420904f194e93e238fc10ed0f11d8680a976d (patch) | |
| tree | 570038dd0e139289dfa20c0c9e9c0ca3312131dc /src/corelib/io | |
| parent | b73ad2dd197c5f35817bb33db17777596671478b (diff) | |
| parent | 930dc240d1938dac8d6512b947cb143fc91c3d21 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ic6e1ae60f891a6b2b568936204d2e84db4177fb4
Diffstat (limited to 'src/corelib/io')
| -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 a0904fea24..5b4d4ec0d8 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -2527,7 +2527,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile, character in keys. In addition, if you save a top-level setting (a key with no slashes in it, e.g., "someKey"), it will appear in the INI file's "General" section. To avoid - overwriting other keys, if you save something using the a key + overwriting other keys, if you save something using a key such as "General/someKey", the key will be located in the "%General" section, \e not in the "General" section. |