diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index 60d429d707..cfcd89333b 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -55,7 +55,6 @@ class QByteArray; class QIODevice; template class QList; -template class QLinkedList; template class QVector; template class QSet; template class QHash; @@ -407,18 +406,6 @@ inline QDataStream &operator<<(QDataStream &s, const QList &l) return QtPrivate::writeSequentialContainer(s, l); } -template -inline QDataStream &operator>>(QDataStream &s, QLinkedList &l) -{ - return QtPrivate::readListBasedContainer(s, l); -} - -template -inline QDataStream &operator<<(QDataStream &s, const QLinkedList &l) -{ - return QtPrivate::writeSequentialContainer(s, l); -} - template inline QDataStream &operator>>(QDataStream &s, QVector &v) { diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index 8994449fbf..1f6d537b18 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -561,6 +562,20 @@ QLinkedList QLinkedList::operator+(const QLinkedList &l) const Q_DECLARE_SEQUENTIAL_ITERATOR(LinkedList) Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(LinkedList) +#ifndef QT_NO_DATASTREAM +template +inline QDataStream &operator>>(QDataStream &s, QLinkedList &l) +{ + return QtPrivate::readListBasedContainer(s, l); +} + +template +inline QDataStream &operator<<(QDataStream &s, const QLinkedList &l) +{ + return QtPrivate::writeSequentialContainer(s, l); +} +#endif + QT_END_NAMESPACE #endif // QLINKEDLIST_H