diff options
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 1 | ||||
| -rw-r--r-- | src/network/access/qnetworkcookie.h | 3 | ||||
| -rw-r--r-- | src/network/access/qnetworkcookiejar.h | 5 | ||||
| -rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 1 | ||||
| -rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 1 |
7 files changed, 7 insertions, 6 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 32b91708ad..3a80b9ed92 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -45,6 +45,7 @@ #include "qnetworkreply.h" #include "qnetworkreply_p.h" #include "qnetworkcookie.h" +#include "qnetworkcookiejar.h" #include "qabstractnetworkcache.h" #include "QtNetwork/qnetworksession.h" diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h index 9c20fe4a5a..fd9c825ddc 100644 --- a/src/network/access/qnetworkcookie.h +++ b/src/network/access/qnetworkcookie.h @@ -113,9 +113,6 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug, const QNetworkCookie &); QT_END_NAMESPACE -// ### Qt5 remove this include -#include <QtNetwork/QNetworkCookieJar> - Q_DECLARE_METATYPE(QNetworkCookie) Q_DECLARE_METATYPE(QList<QNetworkCookie>) diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h index c53d45359d..4ff27d8cf0 100644 --- a/src/network/access/qnetworkcookiejar.h +++ b/src/network/access/qnetworkcookiejar.h @@ -45,15 +45,14 @@ #include <QtCore/QObject> #include <QtCore/QUrl> -// ### Qt5 remove this include -#include <QtNetwork/QNetworkCookie> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Network) +class QNetworkCookie; + class QNetworkCookieJarPrivate; class Q_NETWORK_EXPORT QNetworkCookieJar: public QObject { diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index 48767f5b13..cd142bfb0a 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -48,6 +48,7 @@ #include "qnetworkrequest.h" #include "qnetworkreply.h" #include "qnetworkrequest_p.h" +#include "qnetworkcookie.h" #include "qnetworkcookie_p.h" #include "QtCore/qdatetime.h" #include "QtCore/qelapsedtimer.h" diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 82579f0d54..1f9efa6ed9 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -42,6 +42,7 @@ #include "qnetworkreplyimpl_p.h" #include "qnetworkaccessbackend_p.h" #include "qnetworkcookie.h" +#include "qnetworkcookiejar.h" #include "qabstractnetworkcache.h" #include "QtCore/qcoreapplication.h" #include "QtCore/qdatetime.h" diff --git a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp index e881e85317..6ef08131a5 100644 --- a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp +++ b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp @@ -42,6 +42,7 @@ #include <QtTest/QtTest> #include <QtNetwork/QNetworkCookieJar> +#include <QtNetwork/QNetworkCookie> #include "private/qtldurl_p.h" class tst_QNetworkCookieJar: public QObject diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index e2c5798c53..a20a5763a3 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -63,6 +63,7 @@ #include <QtNetwork/qnetworkrequest.h> #include <QtNetwork/qnetworkreply.h> #include <QtNetwork/qnetworkcookie.h> +#include <QtNetwork/QNetworkCookieJar> #include <QtNetwork/QHttpPart> #include <QtNetwork/QHttpMultiPart> #include <QtNetwork/QNetworkProxyQuery> |