diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp index 1e11c9cd96a..bd44e570378 100644 --- a/src/network/access/qhttpthreaddelegate.cpp +++ b/src/network/access/qhttpthreaddelegate.cpp @@ -151,9 +151,9 @@ public: QNetworkAccessCachedHttpConnection(quint16 connectionCount, const QString &hostName, quint16 port, bool encrypt, bool isLocalSocket, QHttpNetworkConnection::ConnectionType connectionType) : QHttpNetworkConnection(connectionCount, hostName, port, encrypt, isLocalSocket, /*parent=*/nullptr, connectionType) + ,CacheableObject(Option::Expires | Option::Shareable) { - setExpires(true); - setShareable(true); + } virtual void dispose() override diff --git a/src/network/access/qnetworkaccessauthenticationmanager.cpp b/src/network/access/qnetworkaccessauthenticationmanager.cpp index ab7c27b885e..6e86d6387c2 100644 --- a/src/network/access/qnetworkaccessauthenticationmanager.cpp +++ b/src/network/access/qnetworkaccessauthenticationmanager.cpp @@ -22,9 +22,8 @@ class QNetworkAuthenticationCache : private QList #include "QtCore/qhash.h" #include "QtCore/qmetatype.h" @@ -36,7 +37,6 @@ class QNetworkAccessCache: public QObject public: struct Node; typedef QHash NodeHash; - class CacheableObject { friend class QNetworkAccessCache; @@ -45,14 +45,17 @@ public: bool shareable; qint64 expiryTimeoutSeconds = -1; public: - CacheableObject(); + enum class Option { + Expires = 0x01, + Shareable = 0x02, + }; + typedef QFlags