From d26709cd8c0b09242f8b65bc1de696bcf87fad7c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 12 May 2023 08:33:15 -0700 Subject: [PATCH] Network: Remove Q_DECL_METATYPE_EXTERN for single-.cpp metatypes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These were added in commit 20e6a049fee48e876c8c6903101b58f918b5aab2 as a massive sweep of all Q_DECLARE_METATYPE, without thought as to whether they were actually needed or not. If they are used as a metatype in a single .cpp file, they don't need to be. Incidentally removes the entirely incorrect Q_NETWORK_EXPORT of QDnsLookupReply. Pick-to: 6.5 Change-Id: I3e3bfef633af4130a03afffd175e6f378f09a3aa Reviewed-by: Qt CI Bot Reviewed-by: Mårten Nordheim --- src/network/access/qnetworkaccesscache.cpp | 3 --- src/network/access/qnetworkaccesscache_p.h | 3 --- src/network/kernel/qdnslookup.cpp | 2 -- src/network/kernel/qdnslookup_p.h | 2 -- 4 files changed, 10 deletions(-) diff --git a/src/network/access/qnetworkaccesscache.cpp b/src/network/access/qnetworkaccesscache.cpp index 9a1a3d38065..2bc0e8fb708 100644 --- a/src/network/access/qnetworkaccesscache.cpp +++ b/src/network/access/qnetworkaccesscache.cpp @@ -14,9 +14,6 @@ QT_BEGIN_NAMESPACE -QT_IMPL_METATYPE_EXTERN_TAGGED(QNetworkAccessCache::CacheableObject*, - QNetworkAccessCache__CacheableObject_ptr) - enum ExpiryTimeEnum { ExpiryTime = 120 }; diff --git a/src/network/access/qnetworkaccesscache_p.h b/src/network/access/qnetworkaccesscache_p.h index d0c032de6fd..3be7967ca1f 100644 --- a/src/network/access/qnetworkaccesscache_p.h +++ b/src/network/access/qnetworkaccesscache_p.h @@ -87,7 +87,4 @@ private: QT_END_NAMESPACE -QT_DECL_METATYPE_EXTERN_TAGGED(QNetworkAccessCache::CacheableObject*, - QNetworkAccessCache__CacheableObject_ptr, /* not exported */) - #endif diff --git a/src/network/kernel/qdnslookup.cpp b/src/network/kernel/qdnslookup.cpp index fb8a96a049b..98c2dc0eed1 100644 --- a/src/network/kernel/qdnslookup.cpp +++ b/src/network/kernel/qdnslookup.cpp @@ -13,8 +13,6 @@ QT_BEGIN_NAMESPACE -QT_IMPL_METATYPE_EXTERN(QDnsLookupReply) - #if QT_CONFIG(thread) Q_GLOBAL_STATIC(QDnsLookupThreadPool, theDnsLookupThreadPool); #endif diff --git a/src/network/kernel/qdnslookup_p.h b/src/network/kernel/qdnslookup_p.h index 995640362cc..3a8e1a53cb1 100644 --- a/src/network/kernel/qdnslookup_p.h +++ b/src/network/kernel/qdnslookup_p.h @@ -201,6 +201,4 @@ public: QT_END_NAMESPACE -QT_DECL_METATYPE_EXTERN(QDnsLookupReply, Q_NETWORK_EXPORT) - #endif // QDNSLOOKUP_P_H