From 081207dc377962537ca7e8fc90a20197f05c30c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 21 Aug 2020 11:57:40 +0200 Subject: Make QNetworkAccessManager::supportedSchemes virtual Change-Id: I6807e2133049551bbaa4c6f312b6a00ea752f81b Reviewed-by: Timur Pocheptsov --- src/network/access/qnetworkaccessmanager.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/network/access/qnetworkaccessmanager.cpp') 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() */ -- cgit v1.2.3