diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-03 15:49:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-03 15:49:15 +0200 |
| commit | 6357813207c866c99aadfd91af8fb3affe891f1d (patch) | |
| tree | 69464d415b12ebaa3e57d88d7b5cd113878be988 /src/corelib/io/qsettings_mac.cpp | |
| parent | 5a76a3fb03f8d1dc8cb367de1a1dc6a37048376a (diff) | |
| parent | b3fcaea5f2b97d3f562add97aee48cbb469c875a (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
configure
src/3rdparty/double-conversion/include/double-conversion/utils.h
src/corelib/global/qnamespace.qdoc
src/corelib/tools/qsimd_p.h
tests/auto/corelib/io/qfile/tst_qfile.cpp
Change-Id: I3ca1007bab5355d251c13002a18e93d81c254d34
Diffstat (limited to 'src/corelib/io/qsettings_mac.cpp')
| -rw-r--r-- | src/corelib/io/qsettings_mac.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qsettings_mac.cpp b/src/corelib/io/qsettings_mac.cpp index ceee165459..d73cc4d298 100644 --- a/src/corelib/io/qsettings_mac.cpp +++ b/src/corelib/io/qsettings_mac.cpp @@ -149,7 +149,7 @@ static QCFType<CFPropertyListRef> macValue(const QVariant &value) bool singleton = (values.count() == 1); if (singleton) { - switch (values.first().type()) { + switch (values.constFirst().type()) { // should be same as above (look for LIST) case QVariant::List: case QVariant::StringList: @@ -161,7 +161,7 @@ static QCFType<CFPropertyListRef> macValue(const QVariant &value) } cfkeys[numUniqueKeys] = QCFString::toCFStringRef(key); - cfvalues[numUniqueKeys] = singleton ? macValue(values.first()) : macList(values); + cfvalues[numUniqueKeys] = singleton ? macValue(values.constFirst()) : macList(values); ++numUniqueKeys; } |