QtNetwork: sweep Q_DECLARE_METATYPE → QT_DECL_METATYPE_EXTERN [2/2]: private API

It's one of our best tools to improve compile times.

Can't backport to Qt 6.2 because the macros don't exist there.

Pick-to: 6.3
Task-number: QTBUG-102206
Change-Id: Ic8f3870d8eec6211c4be506dc67717cc4e0ff7d6
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

src/network/access/http2/http2protocol.cpp

@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+QT_IMPL_METATYPE_EXTERN_TAGGED(Http2::Settings, Http2__Settings)
+
 Q_LOGGING_CATEGORY(QT_HTTP2, "qt.network.http2")
 
 namespace Http2

src/network/access/http2/http2protocol_p.h

@@ -200,6 +200,6 @@ Q_DECLARE_LOGGING_CATEGORY(QT_HTTP2)
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Http2::Settings)
+QT_DECL_METATYPE_EXTERN_TAGGED(Http2::Settings, Http2__Settings, Q_NETWORK_EXPORT)
 
 #endif

src/network/access/qhttpnetworkrequest.cpp

@@ -42,6 +42,8 @@
 
 QT_BEGIN_NAMESPACE
 
+QT_IMPL_METATYPE_EXTERN(QHttpNetworkRequest)
+
 QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(QHttpNetworkRequest::Operation op,
         QHttpNetworkRequest::Priority pri, const QUrl &newUrl)
     : QHttpNetworkHeaderPrivate(newUrl), operation(op), priority(pri), uploadByteDevice(nullptr),

src/network/access/qhttpnetworkrequest_p.h

@@ -195,6 +195,6 @@ public:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QHttpNetworkRequest)
+QT_DECL_METATYPE_EXTERN(QHttpNetworkRequest, Q_AUTOTEST_EXPORT)
 
 #endif // QHTTPNETWORKREQUEST_H

src/network/access/qnetworkaccesscache.cpp

@@ -50,6 +50,9 @@
 
 QT_BEGIN_NAMESPACE
 
+QT_IMPL_METATYPE_EXTERN_TAGGED(QNetworkAccessCache::CacheableObject*,
+                               QNetworkAccessCache__CacheableObject_ptr)
+
 enum ExpiryTimeEnum {
     ExpiryTime = 120
 };

src/network/access/qnetworkaccesscache_p.h

@@ -123,6 +123,7 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QNetworkAccessCache::CacheableObject*)
+QT_DECL_METATYPE_EXTERN_TAGGED(QNetworkAccessCache::CacheableObject*,
+                               QNetworkAccessCache__CacheableObject_ptr, /* not exported */)
 
 #endif

src/network/access/qnetworkreplyfileimpl.cpp

@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+QT_IMPL_METATYPE_EXTERN_TAGGED(QNetworkRequest::KnownHeaders, QNetworkRequest__KnownHeaders)
+
 QNetworkReplyFileImplPrivate::QNetworkReplyFileImplPrivate()
     : QNetworkReplyPrivate(), managerPrivate(nullptr), realFile(nullptr)
 {

src/network/access/qnetworkreplyfileimpl_p.h

@@ -97,6 +97,8 @@ public:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QNetworkRequest::KnownHeaders)
+// ### move to qnetworkrequest.h
+QT_DECL_METATYPE_EXTERN_TAGGED(QNetworkRequest::KnownHeaders,
+                               QNetworkRequest__KnownHeaders, Q_NETWORK_EXPORT)
 
 #endif // QNETWORKREPLYFILEIMPL_H

src/network/access/qnetworkreplyimpl.cpp

@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+QT_IMPL_METATYPE_EXTERN_TAGGED(QSharedPointer<char>, QSharedPointer_char)
+
 inline QNetworkReplyImplPrivate::QNetworkReplyImplPrivate()
     : backend(nullptr), outgoingData(nullptr),
       copyDevice(nullptr),

src/network/access/qnetworkreplyimpl_p.h

@@ -193,6 +193,7 @@ Q_DECLARE_TYPEINFO(QNetworkReplyImplPrivate::InternalNotifications, Q_PRIMITIVE_
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QSharedPointer<char>)
+// ### move to qsharedpointer_impl.h
+QT_DECL_METATYPE_EXTERN_TAGGED(QSharedPointer<char>, QSharedPointer_char, Q_NETWORK_EXPORT)
 
 #endif

src/network/kernel/qdnslookup.cpp

@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+QT_IMPL_METATYPE_EXTERN(QDnsLookupReply)
+
 #if QT_CONFIG(thread)
 Q_GLOBAL_STATIC(QDnsLookupThreadPool, theDnsLookupThreadPool);
 #endif

src/network/kernel/qdnslookup_p.h

@@ -238,6 +238,6 @@ public:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QDnsLookupReply)
+QT_DECL_METATYPE_EXTERN(QDnsLookupReply, Q_NETWORK_EXPORT)
 
 #endif // QDNSLOOKUP_P_H