summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qsettings.cpp
diff options
context:
space:
mode:
authorSebastian Schuberth <sschuberth@gmail.com>2015-08-27 21:53:49 +0200
committerSebastian Schuberth <sschuberth@gmail.com>2015-08-31 07:59:41 +0000
commit1ca789bfe3c5617efdec698e4f5377c0611589d2 (patch)
tree0470042a2f78a9a15507e483728ce63dc82cdb59 /src/corelib/io/qsettings.cpp
parentc3d8ab78b8bc63cc15b56719fc7bf2ec42c800de (diff)
The new Registry{32,64}Format enum values did not make it into Qt 5.6
Change-Id: I85f17c1d149071b03357781bb4e973fc79ad658f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/corelib/io/qsettings.cpp')
-rw-r--r--src/corelib/io/qsettings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index a756dbb605..d4143c4035 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -2403,12 +2403,12 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
from a 64-bit application running on 64-bit Windows.
On 32-bit Windows or from a 32-bit application on 64-bit Windows,
this works the same as specifying NativeFormat.
- This enum value was added in Qt 5.6.
+ This enum value was added in Qt 5.7.
\value Registry64Format Windows only: Explicitly access the 64-bit system registry
from a 32-bit application running on 64-bit Windows.
On 32-bit Windows or from a 64-bit application on 64-bit Windows,
this works the same as specifying NativeFormat.
- This enum value was added in Qt 5.6.
+ This enum value was added in Qt 5.7.
\value IniFormat Store the settings in INI files.
\value InvalidFormat Special value returned by registerFormat().
\omitvalue CustomFormat1