diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 19:21:00 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 19:21:00 (GMT) |
commit | 0398173542384f1600e1652bbb6449fe735b9359 (patch) | |
tree | 5d8924c18efcc82a9f1d7220c9687d30f5cc4be4 /src/network/access/qhttpnetworkconnection_p.h | |
parent | de1c505ddb5acedf96168df00172b9e3a694a32d (diff) | |
parent | f62d8eb38d35d394aca01f9ec309a43525afb557 (diff) | |
download | Qt-0398173542384f1600e1652bbb6449fe735b9359.zip Qt-0398173542384f1600e1652bbb6449fe735b9359.tar.gz Qt-0398173542384f1600e1652bbb6449fe735b9359.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add translation context to qsTr() benchmark
QtScript: Add autotest for enumeration of QMetaObject properties
QNAM HTTP: Pipelining changes
Diffstat (limited to 'src/network/access/qhttpnetworkconnection_p.h')
-rw-r--r-- | src/network/access/qhttpnetworkconnection_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index 823774e..b5bd300 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -156,6 +156,7 @@ class QHttpNetworkConnectionPrivate : public QObjectPrivate public: static const int defaultChannelCount; static const int defaultPipelineLength; + static const int defaultRePipelineLength; QHttpNetworkConnectionPrivate(const QString &hostName, quint16 port, bool encrypt); QHttpNetworkConnectionPrivate(quint16 channelCount, const QString &hostName, quint16 port, bool encrypt); |