summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2013-11-13 11:29:47 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-17 09:47:21 +0100
commit70bc2e882ffc2ea998717d7fcde2b02a2124f52e (patch)
tree1e2a0f60683d9d5d0055b9c5529e9051baa306c8
parent3e803b5180e7059c01c15ea84cadd54982e1a221 (diff)
QCollator(SortKey): declare as shared
This enables specialisations of (std and q) swap using member-swap and declares the types movable for efficient use in Qt containers, and QList in particular. This is a binary-incompatible change, so cannot wait for 5.2.1. Change-Id: I7e90b6397ac4d00d0a7a5c42bae166c1b43e1994 Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/tools/qcollator.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/tools/qcollator.h b/src/corelib/tools/qcollator.h
index 1007aa7623..941637e200 100644
--- a/src/corelib/tools/qcollator.h
+++ b/src/corelib/tools/qcollator.h
@@ -122,6 +122,9 @@ private:
void detach();
};
+Q_DECLARE_SHARED(QCollatorSortKey)
+Q_DECLARE_SHARED(QCollator)
+
QT_END_NAMESPACE
#endif // QCOLLATOR_P_H