diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-07-02 12:36:13 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-07-12 14:26:30 +0200 |
| commit | 0a724ac74c5aa22a65ff0b81b762433b5d1e2002 (patch) | |
| tree | e35d62edf49f2054552fe835a0923314c49741cb /src/corelib/tools | |
| parent | 389988c42f901f2d8f75a023039d641cf5fba9de (diff) | |
Introduce QT_NO_LINKED_LIST and mark QtBase (almost) free of it
QLinkedList is still used in several tests. Add exceptions for
these subdirs.
Change-Id: I50ccd2a0892129d4a47aa4e2400211690da9a82d
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qcontainerfwd.h | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qlinkedlist.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qlinkedlist.h | 8 |
3 files changed, 14 insertions, 0 deletions
diff --git a/src/corelib/tools/qcontainerfwd.h b/src/corelib/tools/qcontainerfwd.h index 646d8908c3..532b4c95ce 100644 --- a/src/corelib/tools/qcontainerfwd.h +++ b/src/corelib/tools/qcontainerfwd.h @@ -47,7 +47,9 @@ QT_BEGIN_NAMESPACE template <class Key, class T> class QCache; template <class Key, class T> class QHash; +#ifndef QT_NO_LINKED_LIST template <class T> class QLinkedList; +#endif template <class T> class QList; template <class Key, class T> class QMap; template <class Key, class T> class QMultiHash; diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp index d239fe0ef4..3b1bc8aab1 100644 --- a/src/corelib/tools/qlinkedlist.cpp +++ b/src/corelib/tools/qlinkedlist.cpp @@ -37,6 +37,10 @@ ** ****************************************************************************/ +#ifdef QT_NO_LINKED_LIST +# undef QT_NO_LINKED_LIST +#endif + #include "qlinkedlist.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index d4e5bca0ed..996a50fd1b 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -40,6 +40,10 @@ #ifndef QLINKEDLIST_H #define QLINKEDLIST_H +#include <QtCore/qglobal.h> + +#ifndef QT_NO_LINKED_LIST + #include <QtCore/qiterator.h> #include <QtCore/qrefcount.h> #include <QtCore/qcontainertools_impl.h> @@ -581,4 +585,8 @@ inline QDataStream &operator<<(QDataStream &s, const QLinkedList<T> &l) QT_END_NAMESPACE +Q_DECLARE_SEQUENTIAL_CONTAINER_METATYPE(QLinkedList) + +#endif // QT_NO_LINKED_LIST + #endif // QLINKEDLIST_H |