summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstring.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-06-01 23:09:31 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-10 19:08:56 +0200
commit1e9be1327bed93542816abb1aef6bcee25216ce0 (patch)
treec09fd0eb6674f76a4c3dc6232291c81df5c1b909 /src/corelib/tools/qstring.h
parent97e177e58d195f78ac103b3dd0b8ecedb1e07d4c (diff)
Add proper collation support to Qt
QString::localeAwareCompare() has always been a broken way to support collation. The current implementation is not even thread safe. This adds a proper collation class that fixes the problems and finally allows Qt to sort properly according to locale rules. The class is private for now, but is intendent to be made public with 5.1 Change-Id: Idb4e75ff68a398c9813af622af884a90898d2be9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qstring.h')
-rw-r--r--src/corelib/tools/qstring.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index 77bfacc6a4..375dfbb1a4 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -728,6 +728,7 @@ private:
friend class QTextCodec;
friend class QStringRef;
friend class QByteArray;
+ friend class QCollator;
friend struct QAbstractConcatenable;
public: