diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-08-21 11:57:40 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-08-24 17:43:50 +0200 |
| commit | 081207dc377962537ca7e8fc90a20197f05c30c8 (patch) | |
| tree | d4c4590e56cce99132c98f87ba530ed56d2959c6 /src/network/access | |
| parent | 4573d29f6430b8dcb7651d5809ddf4fe5fd608fa (diff) | |
Make QNetworkAccessManager::supportedSchemes virtual
Change-Id: I6807e2133049551bbaa4c6f312b6a00ea752f81b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 13 | ||||
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.h | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 2c4b413411..acec69f41f 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -1279,7 +1279,9 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera Lists all the URL schemes supported by the access manager. - \sa supportedSchemesImplementation() + Reimplement this method to provide your own supported schemes + in a QNetworkAccessManager subclass. It is for instance necessary + when your subclass provides support for new protocols. */ QStringList QNetworkAccessManager::supportedSchemes() const { @@ -1293,19 +1295,16 @@ QStringList QNetworkAccessManager::supportedSchemes() const /*! \since 5.2 + \obsolete Lists all the URL schemes supported by the access manager. You should not call this function directly; use QNetworkAccessManager::supportedSchemes() instead. - Reimplement this slot to provide your own supported schemes - in a QNetworkAccessManager subclass. It is for instance necessary - when your subclass provides support for new protocols. - Because of binary compatibility constraints, the supportedSchemes() - method (introduced in Qt 5.2) is not virtual. Instead, supportedSchemes() - will dynamically detect and call this slot. + method (introduced in Qt 5.2) was not virtual in Qt 5, but now it + is. Override the supportedSchemes method rather than this one. \sa supportedSchemes() */ diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index 255ebaa8fb..568fd00e41 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/src/network/access/qnetworkaccessmanager.h @@ -88,8 +88,7 @@ public: explicit QNetworkAccessManager(QObject *parent = nullptr); ~QNetworkAccessManager(); - // ### Qt 6: turn into virtual - QStringList supportedSchemes() const; + virtual QStringList supportedSchemes() const; void clearAccessCache(); |