From 5bdca47789423210d9e1031749039d7362188c8f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 24 Jan 2023 12:50:32 +0100 Subject: [PATCH] QtNetwork: Remove duplicated QT_DECL_METATYPE It causes conflicts in CMake Unity (Jumbo) builds: qnetworkreplyimpl_p.h:161:1: error: specialization of QMetaTypeId >after instantiation 161 | QT_DECL_METATYPE_EXTERN_TAGGED(QSharedPointer, QSharedPointer_char, Q_NETWORK_EXPORT) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ qtbase/src/network/access/qnetworkreplyimpl_p.h:161:1: error: redefinition of struct QMetaTypeId > qtbase/src/corelib/kernel/qmetatype.h:1711:1: note: previous definition of struct QMetaTypeId > 1711 | QT_FOR_EACH_AUTOMATIC_TEMPLATE_SMART_POINTER(Q_DECLARE_METATYPE_TEMPLATE_SMART_POINTER_ITER) Task-number: QTBUG-109394 Change-Id: I91d13a99dd0f5602ba8d4d8f3baf7659cf63aeef Reviewed-by: Thiago Macieira (cherry picked from commit f4e212b9c430c7300e07ec896116f090cf2d8610) Reviewed-by: Qt Cherry-pick Bot --- src/network/access/qnetworkreplyimpl_p.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index d24edfb567d..9648b8b57a0 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -157,7 +157,4 @@ Q_DECLARE_TYPEINFO(QNetworkReplyImplPrivate::InternalNotifications, Q_PRIMITIVE_ QT_END_NAMESPACE -// ### move to qsharedpointer_impl.h -QT_DECL_METATYPE_EXTERN_TAGGED(QSharedPointer, QSharedPointer_char, Q_NETWORK_EXPORT) - #endif