diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2023-06-16 09:36:23 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2023-06-18 20:06:57 +0000 |
| commit | 674aa084c2d561d2377d8f8a8de1e3e7e60666f6 (patch) | |
| tree | e679c190b7248c7477ce79b6413bb938ba6d55d6 /src/corelib/serialization | |
| parent | 7779400ba6fee98b1f90702f92c17a5a4089c5ce (diff) | |
Q*ValueRef: suppress MSVC warning on deriving from non-exported base
Warning C4275 non dll-interface class 'QJsonValueConstRef' used as base for dll-interface class 'QJsonValueRef' UniRemoteAdapter C:\qt\Qt6.5.1\6.5.1\msvc2019_64\include\QtCore\qjsonvalue.h 219
Pick-to: 6.5 6.6
Fixes: QTBUG-114629
Change-Id: I443cf0c8a76243eead33fffd176930f96c43eb47
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qcborvalue.h | 3 | ||||
| -rw-r--r-- | src/corelib/serialization/qjsonvalue.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h index b90d397bcc..aeac764780 100644 --- a/src/corelib/serialization/qcborvalue.h +++ b/src/corelib/serialization/qcborvalue.h @@ -428,6 +428,8 @@ protected: qsizetype i; }; +QT_WARNING_PUSH +QT6_ONLY(QT_WARNING_DISABLE_MSVC(4275)) // non dll-interface class 'QJsonValueConstRef' used as base for dll-interface class 'QJsonValueRef' class QT6_ONLY(Q_CORE_EXPORT) QCborValueRef : public QCborValueConstRef { public: @@ -582,6 +584,7 @@ private: QT7_ONLY(Q_CORE_EXPORT) static void assign(QCborValueRef that, QCborValue &&other); QT7_ONLY(Q_CORE_EXPORT) static void assign(QCborValueRef that, const QCborValueRef other); }; +QT_WARNING_POP Q_DECLARE_OPERATORS_FOR_FLAGS(QCborValue::EncodingOptions) Q_DECLARE_OPERATORS_FOR_FLAGS(QCborValue::DiagnosticNotationOptions) diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index dddc8a0c30..b0b6b97fab 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -215,6 +215,8 @@ protected: friend class QJsonPrivate::Value; }; +QT_WARNING_PUSH +QT6_ONLY(QT_WARNING_DISABLE_MSVC(4275)) // non dll-interface class 'QJsonValueConstRef' used as base for dll-interface class 'QJsonValueRef' class QT6_ONLY(Q_CORE_EXPORT) QJsonValueRef : public QJsonValueConstRef { public: @@ -273,6 +275,7 @@ private: friend class QJsonArray; friend class QJsonObject; }; +QT_WARNING_POP inline QJsonValue QCborValueConstRef::toJsonValue() const { |