diff options
| author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-08-19 15:00:30 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-08-19 17:53:36 +0200 |
| commit | 6b6e51e5abf56f938c27d194701e2bb20f3459dd (patch) | |
| tree | e39b5b446f0554a3334c99948bcf11a570a9eff8 /src/corelib/tools/qcollator_macx.cpp | |
| parent | cf32311d7473019f5c13fcc596601d84ac0987a3 (diff) | |
OS X - QCollator::compare() returns wrong results.
kUCCollateDigitsAsNumberMask works only if kUCCollateDigitsOverrideMask
is also set.
Update 0: - test added.
Task-number: QTBUG-40777
Change-Id: I48bfec78f5f8439a51f8d749f0fc4397a72b29f2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/corelib/tools/qcollator_macx.cpp')
| -rw-r--r-- | src/corelib/tools/qcollator_macx.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qcollator_macx.cpp b/src/corelib/tools/qcollator_macx.cpp index 877510489a..b9477afedb 100644 --- a/src/corelib/tools/qcollator_macx.cpp +++ b/src/corelib/tools/qcollator_macx.cpp @@ -96,9 +96,9 @@ void QCollator::setNumericMode(bool on) detach(); if (on) - d->collator.options |= kUCCollateDigitsAsNumberMask; + d->collator.options |= kUCCollateDigitsAsNumberMask | kUCCollateDigitsOverrideMask; else - d->collator.options &= ~kUCCollateDigitsAsNumberMask; + d->collator.options &= ~(kUCCollateDigitsAsNumberMask | kUCCollateDigitsOverrideMask); d->init(); } |