diff options
author | con <qtc-committer@nokia.com> | 2011-03-03 14:21:56 (GMT) |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-04 13:29:57 (GMT) |
commit | 8238ca7f3d89d409221c96706eeae196199109c6 (patch) | |
tree | 7e71091beeb9ef8032381104fb110671551720fa | |
parent | 0be49f7c6719d3cfafb7e73a33dfd3f86aa8fb7c (diff) | |
download | Qt-8238ca7f3d89d409221c96706eeae196199109c6.zip Qt-8238ca7f3d89d409221c96706eeae196199109c6.tar.gz Qt-8238ca7f3d89d409221c96706eeae196199109c6.tar.bz2 |
Inconsistency between ini case sensitivity between OS_MAC and WS_QPA.
QPA sets CaseSensitive unconditionally, so if OS_MAC tries to use
CaseInsensitive QSettings will assert. The patch leaves the non-QPA
case unchanged.
-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 92f7636..b084ca5 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -1004,7 +1004,7 @@ void QConfFileSettingsPrivate::initFormat() readFunc = 0; writeFunc = 0; #if defined(Q_OS_MAC) - caseSensitivity = (format == QSettings::NativeFormat) ? Qt::CaseSensitive : Qt::CaseInsensitive; + caseSensitivity = (format == QSettings::NativeFormat) ? Qt::CaseSensitive : IniCaseSensitivity; #else caseSensitivity = IniCaseSensitivity; #endif |