From 969e60e075b2560f499b7a98b502401a23c8c319 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 2 May 2019 20:36:56 +0200 Subject: [PATCH] QTypeInfo: move QLinkedlist declaration to qlinkedlist.h This is in preparation of deprecating QLinkedList. Change-Id: Id5018b7fbc89f8b76b86e97cd09d18b4b8cb6234 Reviewed-by: Thiago Macieira --- src/corelib/global/qtypeinfo.h | 1 - src/corelib/tools/qlinkedlist.h | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 #include #include +#include #include #include @@ -267,6 +268,8 @@ private: iterator detach_helper2(iterator); void freeData(QLinkedListData*); }; +template +Q_DECLARE_TYPEINFO_BODY(QLinkedList, Q_MOVABLE_TYPE|Q_RELOCATABLE_TYPE); template inline QLinkedList::~QLinkedList()