summaryrefslogtreecommitdiffstats
path: root/src/network/access/qnetworkrequest.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-05-16 23:09:00 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-05-16 23:09:00 (GMT)
commit8c216aee5d2e52b6fa36e256615374b9435bb4c9 (patch)
treec65554b66874dae21a0876f804926254073aedd0 /src/network/access/qnetworkrequest.h
parent3340b23699f0286876f1e237a66bdc85076fe191 (diff)
parent3849cd0cca618fac88a54861a3ec30780711ce75 (diff)
downloadQt-8c216aee5d2e52b6fa36e256615374b9435bb4c9.zip
Qt-8c216aee5d2e52b6fa36e256615374b9435bb4c9.tar.gz
Qt-8c216aee5d2e52b6fa36e256615374b9435bb4c9.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/network/access/qnetworkrequest.h')
-rw-r--r--src/network/access/qnetworkrequest.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index a0ef1a6..d2945c4 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -79,6 +79,9 @@ public:
HttpPipeliningAllowedAttribute,
HttpPipeliningWasUsedAttribute,
CustomVerbAttribute,
+ CookieLoadControlAttribute,
+ AuthenticationReuseAttribute,
+ CookieSaveControlAttribute,
User = 1000,
UserMax = 32767
@@ -89,6 +92,10 @@ public:
PreferCache,
AlwaysCache
};
+ enum LoadControl {
+ Automatic = 0,
+ Manual
+ };
enum Priority {
HighPriority = 1,