summaryrefslogtreecommitdiffstats
path: root/src/network/access/qnetworkreplyimpl_p.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-06-26 08:31:19 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-06-26 08:31:19 (GMT)
commitb914c388a809c17e4f76a4dcc1d3a1006e13c115 (patch)
treeef6723688578c7ff13fed8b4ea0c961aaf98fe09 /src/network/access/qnetworkreplyimpl_p.h
parent7278c142089d46946d1ad2558eae949220dfe0c4 (diff)
parentd553f376a34ea1d27492a1a5fd14f79616f6a27c (diff)
downloadQt-b914c388a809c17e4f76a4dcc1d3a1006e13c115.zip
Qt-b914c388a809c17e4f76a4dcc1d3a1006e13c115.tar.gz
Qt-b914c388a809c17e4f76a4dcc1d3a1006e13c115.tar.bz2
Merge branch '4.5'
Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/network/access/qnetworkreplyimpl.cpp
Diffstat (limited to 'src/network/access/qnetworkreplyimpl_p.h')
-rw-r--r--src/network/access/qnetworkreplyimpl_p.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h
index 4d75526..3e89a00 100644
--- a/src/network/access/qnetworkreplyimpl_p.h
+++ b/src/network/access/qnetworkreplyimpl_p.h
@@ -130,6 +130,9 @@ public:
void setup(QNetworkAccessManager::Operation op, const QNetworkRequest &request,
QIODevice *outgoingData);
void setNetworkCache(QAbstractNetworkCache *networkCache);
+
+ void pauseNotificationHandling();
+ void resumeNotificationHandling();
void backendNotify(InternalNotifications notification);
void handleNotifications();
void createCache();
@@ -159,6 +162,8 @@ public:
QIODevice *cacheSaveDevice;
NotificationQueue pendingNotifications;
+ bool notificationHandlingPaused;
+
QUrl urlForLastAuthentication;
#ifndef QT_NO_NETWORKPROXY
QNetworkProxy lastProxyAuthentication;