diff options
Diffstat (limited to 'src/corelib/serialization/qjsonvalue.h')
-rw-r--r-- | src/corelib/serialization/qjsonvalue.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index bda77aa0df..2e99103411 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -141,15 +141,7 @@ private: friend Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonValue &); friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QJsonValue &); - // ### Qt6: Remove this. - void stringDataFromQStringHelper(const QString &string); - - void detach(); - - // ### Qt6: change to an actual QCborValue - qint64 n = 0; - QExplicitlySharedDataPointer<QCborContainerPrivate> d; // needed for Objects, Arrays, Strings - QCborValue::Type t; + QCborValue value; // Assert binary compatibility with pre-5.15 QJsonValue static_assert(sizeof(QExplicitlySharedDataPointer<QCborContainerPrivate>) == sizeof(void *)); |