Network: Remove Q_DECL_METATYPE_EXTERN for single-.cpp metatypes
These were added in commit 20e6a049fe 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 <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
parent
c257e518c1
commit
d26709cd8c
|
|
@ -14,9 +14,6 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QT_IMPL_METATYPE_EXTERN_TAGGED(QNetworkAccessCache::CacheableObject*,
|
||||
QNetworkAccessCache__CacheableObject_ptr)
|
||||
|
||||
enum ExpiryTimeEnum {
|
||||
ExpiryTime = 120
|
||||
};
|
||||
|
|
|
|||
|
|
@ -87,7 +87,4 @@ private:
|
|||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
QT_DECL_METATYPE_EXTERN_TAGGED(QNetworkAccessCache::CacheableObject*,
|
||||
QNetworkAccessCache__CacheableObject_ptr, /* not exported */)
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -13,8 +13,6 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QT_IMPL_METATYPE_EXTERN(QDnsLookupReply)
|
||||
|
||||
#if QT_CONFIG(thread)
|
||||
Q_GLOBAL_STATIC(QDnsLookupThreadPool, theDnsLookupThreadPool);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -201,6 +201,4 @@ public:
|
|||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
QT_DECL_METATYPE_EXTERN(QDnsLookupReply, Q_NETWORK_EXPORT)
|
||||
|
||||
#endif // QDNSLOOKUP_P_H
|
||||
|
|
|
|||
Loading…
Reference in New Issue