From d1f077a43583d7533dcd0f629250a6416d089248 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 27 Nov 2021 10:29:35 -0800 Subject: [PATCH] QJsonValueRef: don't export the entire class in Qt 7 Change-Id: I54f205f6b7314351b078fffd16d061ca8870b453 Reviewed-by: Sona Kurazyan --- src/corelib/serialization/qjsonvalue.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index 06dfb55e19e..cbf555507ba 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -249,12 +249,12 @@ protected: friend class QJsonPrivate::Value; }; -class Q_CORE_EXPORT QJsonValueRef : public QJsonValueConstRef +class QT6_ONLY(Q_CORE_EXPORT) QJsonValueRef : public QJsonValueConstRef { public: QJsonValueRef(const QJsonValueRef &) = default; - QJsonValueRef &operator = (const QJsonValue &val); - QJsonValueRef &operator = (const QJsonValueRef &val); + QT7_ONLY(Q_CORE_EXPORT) QJsonValueRef &operator = (const QJsonValue &val); + QT7_ONLY(Q_CORE_EXPORT) QJsonValueRef &operator = (const QJsonValueRef &val); #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED) // retained for binary compatibility (due to the Q_CORE_EXPORT) because at @@ -295,11 +295,12 @@ public: private: QJsonValue toValue() const; #else + using QJsonValueConstRef::operator[]; private: using QJsonValueConstRef::QJsonValueConstRef; #endif // < Qt 7 - void detach(); + QT7_ONLY(Q_CORE_EXPORT) void detach(); friend class QJsonArray; friend class QJsonObject; };