1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make QNetworkAccessManager::supportedSchemes virtual

Browse Source 
Change-Id: I6807e2133049551bbaa4c6f312b6a00ea752f81b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Mårten Nordheim 2020-08-21 11:57:40 +02:00
parent 4573d29f64
commit 081207dc37
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/access/qnetworkaccessmanager.cpp
View File

@ -1279,7 +1279,9 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
Lists all the URL schemes supported by the access manager. 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 QStringList QNetworkAccessManager::supportedSchemes() const
{ {
@ -1293,19 +1295,16 @@ QStringList QNetworkAccessManager::supportedSchemes() const
/*! /*!
\since 5.2 \since 5.2
\obsolete
Lists all the URL schemes supported by the access manager. Lists all the URL schemes supported by the access manager.
You should not call this function directly; use You should not call this function directly; use
QNetworkAccessManager::supportedSchemes() instead. 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() Because of binary compatibility constraints, the supportedSchemes()
method (introduced in Qt 5.2) is not virtual. Instead, supportedSchemes() method (introduced in Qt 5.2) was not virtual in Qt 5, but now it
will dynamically detect and call this slot. is. Override the supportedSchemes method rather than this one.
\sa supportedSchemes() \sa supportedSchemes()
*/ */

3
src/network/access/qnetworkaccessmanager.h
View File

@ -88,8 +88,7 @@ public:
explicit QNetworkAccessManager(QObject *parent = nullptr); explicit QNetworkAccessManager(QObject *parent = nullptr);
~QNetworkAccessManager(); ~QNetworkAccessManager();
// ### Qt 6: turn into virtual virtual QStringList supportedSchemes() const;
QStringList supportedSchemes() const;
void clearAccessCache(); void clearAccessCache();