diff options
Diffstat (limited to 'src/corelib/io/qsettings.cpp')
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 5b4d4ec0d8..ebcaf062e3 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -72,6 +72,7 @@ # include <ioLib.h> #endif +#include <algorithm> #include <stdlib.h> #ifdef Q_OS_WIN // for homedirpath reading from registry @@ -1905,7 +1906,7 @@ bool QConfFileSettingsPrivate::writeIniFile(QIODevice &device, const ParsedSetti sections.reserve(sectionCount); for (i = iniMap.constBegin(); i != iniMap.constEnd(); ++i) sections.append(QSettingsIniKey(i.key(), i.value().position)); - qSort(sections); + std::sort(sections.begin(), sections.end()); bool writeError = false; for (int j = 0; !writeError && j < sectionCount; ++j) { @@ -3443,7 +3444,7 @@ void QSettings::setUserIniPath(const QString &dir) \c XDG_CONFIG_HOME environment variable. The default SystemScope paths on Unix and Mac OS X (\c /etc/xdg) can be overridden when building the Qt library using the \c configure script's \c - --sysconfdir flag (see QLibraryInfo for details). + -sysconfdir flag (see QLibraryInfo for details). Setting the NativeFormat paths on Windows and Mac OS X has no effect. |