diff options
Diffstat (limited to 'src/corelib/serialization')
-rw-r--r-- | src/corelib/serialization/qjsonarray.h | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qjsondocument.h | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonobject.h | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonvalue.h | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qxmlstream.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/serialization/qjsonarray.h b/src/corelib/serialization/qjsonarray.h index d39522bd2f..4466210ce6 100644 --- a/src/corelib/serialization/qjsonarray.h +++ b/src/corelib/serialization/qjsonarray.h @@ -250,7 +250,7 @@ private: QExplicitlySharedDataPointer<QCborContainerPrivate> a; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonArray) +Q_DECLARE_SHARED(QJsonArray) Q_CORE_EXPORT size_t qHash(const QJsonArray &array, size_t seed = 0); diff --git a/src/corelib/serialization/qjsondocument.h b/src/corelib/serialization/qjsondocument.h index fd3a3ac61d..8c2840eda7 100644 --- a/src/corelib/serialization/qjsondocument.h +++ b/src/corelib/serialization/qjsondocument.h @@ -172,7 +172,7 @@ private: std::unique_ptr<QJsonDocumentPrivate> d; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonDocument) +Q_DECLARE_SHARED(QJsonDocument) #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY) Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonDocument &); diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index dc449eecf4..4002a8bc24 100644 --- a/src/corelib/serialization/qjsonobject.h +++ b/src/corelib/serialization/qjsonobject.h @@ -300,7 +300,7 @@ private: QExplicitlySharedDataPointer<QCborContainerPrivate> o; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonObject) +Q_DECLARE_SHARED(QJsonObject) Q_CORE_EXPORT size_t qHash(const QJsonObject &object, size_t seed = 0); diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index fa877ff7ee..6acdace562 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -230,7 +230,7 @@ public: QJsonValueRef* operator->() { return &valueRef; } }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonValue) +Q_DECLARE_SHARED(QJsonValue) Q_CORE_EXPORT size_t qHash(const QJsonValue &value, size_t seed = 0); diff --git a/src/corelib/serialization/qxmlstream.h b/src/corelib/serialization/qxmlstream.h index 1b22dfa4c7..6d6930767a 100644 --- a/src/corelib/serialization/qxmlstream.h +++ b/src/corelib/serialization/qxmlstream.h @@ -88,7 +88,7 @@ public: inline int position() const { return m_position; } inline int size() const { return m_size; } }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QXmlStreamStringRef) +Q_DECLARE_SHARED(QXmlStreamStringRef) class QXmlStreamReaderPrivate; |