From 80f6f2206157e6d75d2c4e473ca1838aaa00a61c Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 4 May 2021 15:53:55 +0200 Subject: [PATCH] QmlDesigner: Do not define extra stream operators for QList This is not required and creates issues with Qt 6. Change-Id: I74e875fe785d5baa4d0688d0ef86a9151750e56c Reviewed-by: Miikka Heikkinen Reviewed-by: Thomas Hartmann --- .../designercore/include/propertycontainer.h | 4 --- .../designercore/model/propertycontainer.cpp | 32 ------------------- 2 files changed, 36 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/include/propertycontainer.h b/src/plugins/qmldesigner/designercore/include/propertycontainer.h index 5eebf01fbd4..ae38f9aafce 100644 --- a/src/plugins/qmldesigner/designercore/include/propertycontainer.h +++ b/src/plugins/qmldesigner/designercore/include/propertycontainer.h @@ -66,8 +66,4 @@ private: mutable QVariant m_value; }; -QMLDESIGNERCORE_EXPORT QDataStream &operator<<(QDataStream &stream, const QList &propertyContainerList); -QMLDESIGNERCORE_EXPORT QDataStream &operator>>(QDataStream &stream, QList &propertyContainerList); -QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, QList &propertyContainerList); - } //namespace QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp index ae62b4d0e6c..440b91ffa08 100644 --- a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp +++ b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp @@ -113,37 +113,5 @@ QDebug operator<<(QDebug debug, const PropertyContainer &propertyContainer) return debug.space(); } -QDataStream &operator<<(QDataStream &stream, const QList &propertyContainerList) -{ - stream << propertyContainerList.count(); - foreach (const PropertyContainer &propertyContainer, propertyContainerList) - stream << propertyContainer; - - return stream; -} - -QDataStream &operator>>(QDataStream &stream, QList &propertyContainerList) -{ - int count; - stream >> count; - Q_ASSERT(count >= 0); - for ( int i = 0; i < count; i++) { - PropertyContainer propertyContainer; - stream >> propertyContainer; - propertyContainerList.append(propertyContainer); - } - - return stream; -} - -QDebug operator<<(QDebug debug, QList &propertyContainerList) -{ - foreach (const PropertyContainer &propertyContainer, propertyContainerList) - debug << propertyContainer; - - return debug.space(); -} - - } //namespace QmlDesigner