remove redundant QT_ALLINONE definition guards

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h
index 27cb62d..5053306 100644 (file)
--- 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<QNetworkCookie>)
-#endif
 
 QT_END_HEADER
 

diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index 3499be9..15eb30f 100644 (file)
--- 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 7ed7693..0a77f4c 100644 (file)
--- 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 0521d49..87d9243 100644 (file)
--- 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<char>)
-#ifdef QT_ALLINONE
-Q_DECLARE_METATYPE(QNetworkCookie)
-Q_DECLARE_METATYPE(QList<QNetworkCookie>)
-Q_DECLARE_METATYPE(QNetworkRequest)
-Q_DECLARE_METATYPE(QNetworkSession::State)
-Q_DECLARE_METATYPE(QNetworkSession::SessionError)
-#endif
 
 QT_BEGIN_NAMESPACE