1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QJsonValueRef: don't export the entire class in Qt 7

Browse Source 
Change-Id: I54f205f6b7314351b078fffd16d061ca8870b453
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
This commit is contained in:
Thiago Macieira 2021-11-27 10:29:35 -08:00
parent 705ea62f9e
commit d1f077a435
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/serialization/qjsonvalue.h
View File

@ -249,12 +249,12 @@ protected:
friend class QJsonPrivate::Value; friend class QJsonPrivate::Value;
}; };
class Q_CORE_EXPORT QJsonValueRef : public QJsonValueConstRef class QT6_ONLY(Q_CORE_EXPORT) QJsonValueRef : public QJsonValueConstRef
{ {
public: public:
QJsonValueRef(const QJsonValueRef &) = default; QJsonValueRef(const QJsonValueRef &) = default;
QJsonValueRef &operator = (const QJsonValue &val); QT7_ONLY(Q_CORE_EXPORT) QJsonValueRef &operator = (const QJsonValue &val);
QJsonValueRef &operator = (const QJsonValueRef &val); QT7_ONLY(Q_CORE_EXPORT) QJsonValueRef &operator = (const QJsonValueRef &val);
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED) #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) && !defined(QT_BOOTSTRAPPED)
// retained for binary compatibility (due to the Q_CORE_EXPORT) because at // retained for binary compatibility (due to the Q_CORE_EXPORT) because at
@ -295,11 +295,12 @@ public:
private: private:
QJsonValue toValue() const; QJsonValue toValue() const;
#else #else
using QJsonValueConstRef::operator[];
private: private:
using QJsonValueConstRef::QJsonValueConstRef; using QJsonValueConstRef::QJsonValueConstRef;
#endif // < Qt 7 #endif // < Qt 7
void detach(); QT7_ONLY(Q_CORE_EXPORT) void detach();
friend class QJsonArray; friend class QJsonArray;
friend class QJsonObject; friend class QJsonObject;
}; };