1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Network: Remove Q_DECL_METATYPE_EXTERN for single-.cpp metatypes

Browse Source 
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Thiago Macieira 2023-05-12 08:33:15 -07:00
parent c257e518c1
commit d26709cd8c
4 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/access/qnetworkaccesscache.cpp
View File

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

3
src/network/access/qnetworkaccesscache_p.h
View File

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

2
src/network/kernel/qdnslookup.cpp
View File

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

2
src/network/kernel/qdnslookup_p.h
View File

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