diff options
| author | Aleix Pol <aleixpol@kde.org> | 2013-09-10 03:54:54 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-13 05:48:10 +0200 |
| commit | 1864b485e4c37db2ef09b8a47a5bf3cc570cc222 (patch) | |
| tree | a48bb10d17385b44a9af77d3e44444d28bae6c17 /src/corelib/tools/qcollator.h | |
| parent | c517a6d6ff70235ed3a3b93a87948add1de743ed (diff) | |
Make QCollator more flexible to use in different platforms
So far we've known that we want QCollator as public API. It hasn't
been possible yet due to the strong dependency that QCollator used
to have on ICU.
This patch adds collation support for the platforms where ICU is not
the best option by using native collation API. Namely Windows and
Mac OS X.
Additionally a fallback POSIX back-end is added, so that we can make
sure it will work on any posix-compliant platform.
Change-Id: Ia1734acbf5f596698a81f2af927cc15636e4c908
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qcollator.h')
| -rw-r--r-- | src/corelib/tools/qcollator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qcollator.h b/src/corelib/tools/qcollator.h index 677092c718..b99fd1c0cc 100644 --- a/src/corelib/tools/qcollator.h +++ b/src/corelib/tools/qcollator.h @@ -60,7 +60,7 @@ public: ~QCollatorSortKey(); QCollatorSortKey &operator=(const QCollatorSortKey &other); #ifdef Q_COMPILER_RVALUE_REFS - QCollatorSortKey &operator=(QCollatorSortKey &&other) + inline QCollatorSortKey &operator=(QCollatorSortKey &&other) { qSwap(d, other.d); return *this; } #endif |