From a21cf59ba7c64db275cb8dd3446dae01104c02d6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 23 Jul 2020 12:12:36 +0000 Subject: [PATCH] remove redundant QT_ALLINONE definition guards Signed-off-by: Ivailo Monev --- src/network/access/qnetworkcookie.h | 2 -- src/network/access/qnetworkrequest.h | 2 -- src/network/bearer/qnetworksession.h | 2 -- src/network/qnetworkcommon_p.h | 7 ------- 4 files changed, 13 deletions(-) diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h index 27cb62daa..5053306b7 100644 --- a/src/network/access/qnetworkcookie.h +++ b/src/network/access/qnetworkcookie.h @@ -104,10 +104,8 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug, const QNetworkCookie &); QT_END_NAMESPACE -#ifndef QT_ALLINONE Q_DECLARE_METATYPE(QNetworkCookie) Q_DECLARE_METATYPE(QList) -#endif QT_END_HEADER diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h index 3499be92a..15eb30fa8 100644 --- a/src/network/access/qnetworkrequest.h +++ b/src/network/access/qnetworkrequest.h @@ -140,9 +140,7 @@ private: QT_END_NAMESPACE -#ifndef QT_ALLINONE Q_DECLARE_METATYPE(QNetworkRequest) -#endif // QT_ALLINONE QT_END_HEADER diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h index 7ed7693f6..0a77f4c35 100644 --- a/src/network/bearer/qnetworksession.h +++ b/src/network/bearer/qnetworksession.h @@ -121,10 +121,8 @@ private: QT_END_NAMESPACE -#ifndef QT_ALLINONE Q_DECLARE_METATYPE(QNetworkSession::State) Q_DECLARE_METATYPE(QNetworkSession::SessionError) -#endif QT_END_HEADER diff --git a/src/network/qnetworkcommon_p.h b/src/network/qnetworkcommon_p.h index 0521d494c..87d924394 100644 --- a/src/network/qnetworkcommon_p.h +++ b/src/network/qnetworkcommon_p.h @@ -8,13 +8,6 @@ Q_DECLARE_METATYPE(QNetworkAccessCache::CacheableObject*) Q_DECLARE_METATYPE(QSharedPointer) -#ifdef QT_ALLINONE -Q_DECLARE_METATYPE(QNetworkCookie) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QNetworkRequest) -Q_DECLARE_METATYPE(QNetworkSession::State) -Q_DECLARE_METATYPE(QNetworkSession::SessionError) -#endif QT_BEGIN_NAMESPACE -- 2.11.0