summaryrefslogtreecommitdiffstats
path: root/src/network/access/qnetworkaccessmanager.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-01 01:01:01 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-01 01:01:02 +0100
commit4b0af2cdbf61572b22ea6b8aa17fc9f52c71ac4b (patch)
tree60fb25a6772f5ac2d26af005b9888ff09c08a6c1 /src/network/access/qnetworkaccessmanager.h
parentcff492fed1d98f45c4c1f4011f1451120c0d1c23 (diff)
parent36e277e91732d6d75fb6d9cb691fe9c0f83f6178 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'src/network/access/qnetworkaccessmanager.h')
-rw-r--r--src/network/access/qnetworkaccessmanager.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index a74ece6d5b..8134abd6a2 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -169,6 +169,9 @@ public:
bool autoDeleteReplies() const;
void setAutoDeleteReplies(bool autoDelete);
+ int transferTimeout();
+ void setTransferTimeout(int timeout = QNetworkRequest::TransferTimeoutPreset);
+
Q_SIGNALS:
#ifndef QT_NO_NETWORKPROXY
void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator);