whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uncomment erroneously commented 'error' 

It was meant to be deprecated in 5.15, not deleted (yet).

Change-Id: I6e3772d6c1d12dc060c1f540e55e756566db22e6
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
Timur Pocheptsov 2020-01-14 10:24:38 +01:00
parent f494e8b58d
commit 0f568d0a67
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/access/qnetworkreply.cpp
View File

@ -565,12 +565,10 @@ QNetworkAccessManager::Operation QNetworkReply::operation() const
\sa setError(), networkError()
*/
/*
QNetworkReply::NetworkError QNetworkReply::error() const
{
return networkError();
}
*/
#endif // QT_DEPRECATED_SINCE(5, 15)
/*!

2
src/network/access/qnetworkreply.h
View File

@ -126,7 +126,7 @@ public:
QNetworkRequest request() const;
#if QT_DEPRECATED_SINCE(5, 15)
// QT_DEPRECATED_X("Use networkError()") NetworkError error() const;
QT_DEPRECATED_X("Use networkError()") NetworkError error() const;
#endif // QT_DEPRECATED_SINCE(5, 15)
NetworkError networkError() const;