diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-05-02 20:36:56 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-05-14 17:00:39 +0000 |
| commit | 969e60e075b2560f499b7a98b502401a23c8c319 (patch) | |
| tree | d8568e220951615db3c233ca23f39e34c199ad10 | |
| parent | 8b9ea7232acb09c964f9e45d0639ec65f729a0d0 (diff) | |
QTypeInfo: move QLinkedlist declaration to qlinkedlist.h
This is in preparation of deprecating QLinkedList.
Change-Id: Id5018b7fbc89f8b76b86e97cd09d18b4b8cb6234
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/global/qtypeinfo.h | 1 | ||||
| -rw-r--r-- | src/corelib/tools/qlinkedlist.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index 636dc24c07..30be47296e 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -213,7 +213,6 @@ Q_DECLARE_MOVABLE_CONTAINER(QList); Q_DECLARE_MOVABLE_CONTAINER(QVector); Q_DECLARE_MOVABLE_CONTAINER(QQueue); Q_DECLARE_MOVABLE_CONTAINER(QStack); -Q_DECLARE_MOVABLE_CONTAINER(QLinkedList); Q_DECLARE_MOVABLE_CONTAINER(QSet); #undef Q_DECLARE_MOVABLE_CONTAINER diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index 1f6d537b18..6bc053a4c0 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -44,6 +44,7 @@ #include <QtCore/qrefcount.h> #include <QtCore/qcontainertools_impl.h> #include <QtCore/qdatastream.h> +#include <QtCore/qtypeinfo.h> #include <algorithm> #include <initializer_list> @@ -267,6 +268,8 @@ private: iterator detach_helper2(iterator); void freeData(QLinkedListData*); }; +template <typename T> +Q_DECLARE_TYPEINFO_BODY(QLinkedList<T>, Q_MOVABLE_TYPE|Q_RELOCATABLE_TYPE); template <typename T> inline QLinkedList<T>::~QLinkedList() |