From 81bcff5c78954eab091856d28eca69784c0889c4 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Mon, 2 Sep 2024 11:00:38 +0200 Subject: [PATCH] Do not export QDnsTlsAssociationRecord wholesale This is a non-polymorphic class, so explicitly export only the out-of-line methods. Amends 4503dabfbd11c084c2781a679c9af12d5fb8f763. Found in 6.8 API review. Pick-to: 6.8 Change-Id: I600d355a3b3abd321841dfc33030de9e5707c38a Reviewed-by: Marc Mutz --- src/network/kernel/qdnslookup.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/network/kernel/qdnslookup.h b/src/network/kernel/qdnslookup.h index 0cf601698f7..e6f81734702 100644 --- a/src/network/kernel/qdnslookup.h +++ b/src/network/kernel/qdnslookup.h @@ -141,9 +141,9 @@ private: Q_DECLARE_SHARED(QDnsTextRecord) -class Q_NETWORK_EXPORT QDnsTlsAssociationRecord +class QDnsTlsAssociationRecord { - Q_GADGET + Q_GADGET_EXPORT(Q_NETWORK_EXPORT) Q_CLASSINFO("RegisterEnumClassesUnscoped", "false") public: enum class CertificateUsage : quint8 { @@ -189,21 +189,21 @@ public: }; Q_ENUM(MatchingType) - QDnsTlsAssociationRecord(); - QDnsTlsAssociationRecord(const QDnsTlsAssociationRecord &other); + Q_NETWORK_EXPORT QDnsTlsAssociationRecord(); + Q_NETWORK_EXPORT QDnsTlsAssociationRecord(const QDnsTlsAssociationRecord &other); QDnsTlsAssociationRecord(QDnsTlsAssociationRecord &&other) noexcept = default; QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QDnsTlsAssociationRecord) - QDnsTlsAssociationRecord &operator=(const QDnsTlsAssociationRecord &other); - ~QDnsTlsAssociationRecord(); + Q_NETWORK_EXPORT QDnsTlsAssociationRecord &operator=(const QDnsTlsAssociationRecord &other); + Q_NETWORK_EXPORT ~QDnsTlsAssociationRecord(); void swap(QDnsTlsAssociationRecord &other) noexcept { d.swap(other.d); } - QString name() const; - quint32 timeToLive() const; - CertificateUsage usage() const; - Selector selector() const; - MatchingType matchType() const; - QByteArray value() const; + Q_NETWORK_EXPORT QString name() const; + Q_NETWORK_EXPORT quint32 timeToLive() const; + Q_NETWORK_EXPORT CertificateUsage usage() const; + Q_NETWORK_EXPORT Selector selector() const; + Q_NETWORK_EXPORT MatchingType matchType() const; + Q_NETWORK_EXPORT QByteArray value() const; private: QExplicitlySharedDataPointer d;