From 81ba16cad933981f55218964a89ed1446022efba Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Mon, 24 Mar 2014 16:12:20 +0100
Subject: Fix case insensitive comparisons using QCollator

In ICU the strength parameter decides whether a comparison is
case sensitive or not.

Fix mac comparison code. It can't have worked before.

Added some basic automated testing for QCollator.

Change-Id: I2646c464fd22ccd3a93c461fa3dba4bd1d4c7b4b
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
---
 src/corelib/tools/qcollator_macx.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/corelib/tools/qcollator_macx.cpp')

diff --git a/src/corelib/tools/qcollator_macx.cpp b/src/corelib/tools/qcollator_macx.cpp
index 8985cd4eba..877510489a 100644
--- a/src/corelib/tools/qcollator_macx.cpp
+++ b/src/corelib/tools/qcollator_macx.cpp
@@ -128,12 +128,15 @@ bool QCollator::ignorePunctuation() const
 int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const
 {
     SInt32 result;
-    return UCCompareText(d->collator.collator,
+    Boolean equivalent;
+    UCCompareText(d->collator.collator,
                          reinterpret_cast<const UniChar *>(s1), len1,
                          reinterpret_cast<const UniChar *>(s2), len2,
-                         NULL,
+                         &equivalent,
                          &result);
-    return result;
+    if (equivalent)
+        return 0;
+    return result < 0 ? -1 : 1;
 }
 int QCollator::compare(const QString &str1, const QString &str2) const
 {
-- 
cgit v1.2.3