diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 668e7e20a0e..ff05fb2ca92 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -1425,18 +1425,16 @@ void QNetworkAccessManager::setAutoDeleteReplies(bool shouldAutoDelete) } /*! + \fn int QNetworkAccessManager::transferTimeout() const \since 5.15 Returns the timeout used for transfers, in milliseconds. \sa setTransferTimeout() */ -int QNetworkAccessManager::transferTimeout() const -{ - return int(d_func()->transferTimeout.count()); -} /*! + \fn void QNetworkAccessManager::setTransferTimeout(int timeout) \since 5.15 Sets \a timeout as the transfer timeout in milliseconds. @@ -1444,10 +1442,6 @@ int QNetworkAccessManager::transferTimeout() const \sa setTransferTimeout(std::chrono::milliseconds), transferTimeout(), transferTimeoutAsDuration() */ -void QNetworkAccessManager::setTransferTimeout(int timeout) -{ - setTransferTimeout(std::chrono::milliseconds(timeout)); -} /*! \since 6.7 diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index 6aa05b5cc81..85f4bc21d38 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/src/network/access/qnetworkaccessmanager.h @@ -111,7 +111,9 @@ class Q_NETWORK_EXPORT QNetworkAccessManager: public QObject bool autoDeleteReplies() const; void setAutoDeleteReplies(bool autoDelete); + QT_NETWORK_INLINE_SINCE(6, 8) int transferTimeout() const; + QT_NETWORK_INLINE_SINCE(6, 8) void setTransferTimeout(int timeout); std::chrono::milliseconds transferTimeoutAsDuration() const; @@ -153,6 +155,18 @@ protected Q_SLOTS: #endif }; +#if QT_NETWORK_INLINE_IMPL_SINCE(6, 8) +int QNetworkAccessManager::transferTimeout() const +{ + return int(transferTimeoutAsDuration().count()); +} + +void QNetworkAccessManager::setTransferTimeout(int timeout) +{ + setTransferTimeout(std::chrono::milliseconds(timeout)); +} +#endif // INLINE_SINCE 6.8 + QT_END_NAMESPACE #endif