diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-29 20:42:46 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-29 20:45:34 (GMT) |
| commit | a5f0c51b3c9156011e8f051729b386e61fdf7851 (patch) | |
| tree | c6c044e115806e722d1bd5f5875a075ef8fd8640 /src/network/access | |
| parent | 067ffcb46ebcf2b9350bfd0f466736c2c44277a9 (diff) | |
| download | Qt-a5f0c51b3c9156011e8f051729b386e61fdf7851.zip Qt-a5f0c51b3c9156011e8f051729b386e61fdf7851.tar.gz Qt-a5f0c51b3c9156011e8f051729b386e61fdf7851.tar.bz2 | |
Fix compilation and source compatibility.
Source code that includes <QNetworkCookieJar> implicitly includes
QNetworkCookie in Qt 4.5. Restore this and keep Qt compiling after
the split up by including qnetworkcookie.h from qnetworkcookiejar.h
Reviewed-by: Trust me
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qnetworkcookiejar.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h index 6ff201e..fae0857 100644 --- a/src/network/access/qnetworkcookiejar.h +++ b/src/network/access/qnetworkcookiejar.h @@ -45,14 +45,15 @@ #include <QtCore/QObject> #include <QtCore/QUrl> +// ### Qt5 remove this include +#include "qnetworkcookie.h" + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Network) -class QNetworkCookie; - class QNetworkCookieJarPrivate; class Q_NETWORK_EXPORT QNetworkCookieJar: public QObject { |