Add more deprecation notices to QtNetwork release notes

And move the ones that was already there under the QtNetwork point. Change-Id: I4f9641f78c624b1846699292e053ee148178df4a Reviewed-by: Edward Welbourne <[email protected]> Reviewed-by: Timur Pocheptsov <[email protected]>
fwcd · May 7, 2020 · 66908ba · 66908ba
1 parent 6ebef2e
commit 66908ba
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/dist/changes-5.15.0 b/dist/changes-5.15.0
@@ -46,23 +46,21 @@ information about a particular change.
  - QtNetwork:
    * QNetworkConfigurationManager, QNetworkConfiguration and QNetworkSession
      are deprecated, to be removed in Qt 6.
+   * QNetworkAccessManager::activeConfiguration, configuration and
+     setConfiguration are deprecated, to be removed in Qt 6.
+   * QNetworkAccessManager::networkAccessible, setNetworkAccessible and
+     the NetworkAccessibility enum are deprecated, to be removed in Qt 6.
+   * QLocalSocket::error() (the signal) is deprecated; superseded by
+     errorOccurred()
+   * QAbstractSocket::error() (the signal) is deprecated; superseded by
+     errorOccurred()
+   * QNetworkReply::error() (the signal) is deprecated; superseded by
+     errorOccurred()
+   * [QTBUG-80369] QSslSocket::sslErrors() (the getter) was deprecated and
+     superseded by sslHandshakeErrors()
 
- - [REVERTED] [QTBUG-80369] QAbstractSocket::error() (the getter) is
-   deprecated; superseded by socketError().
- - [REVERTED] [QTBUG-80369] QLocalSocket::error() (the getter) is
-   deprecated; superseded by socketError().
- - [QTBUG-80369] QSslSocket::sslErrors() (the getter) was deprecated and
-   superseded by sslHandshakeErrors()
- - [REVERTED] [QTBUG-80369] QNetworkReply::error() (the getter) was
-   deprecated; superseded by networkError().
  - [QTBUG-81630][QTBUG-80312] QLinkedList is deprecated and will be moved
    to Qt5Compat in Qt 6. It is recommended to use std::list instead.
- - QLocalSocket::error() (the signal) is deprecated; superseded by
-   errorOccurred()
- - QAbstractSocket::error() (the signal) is deprecated; superseded by
-   errorOccurred()
- - QNetworkReply::error() (the signal) is deprecated; superseded by
-   errorOccurred()
 
 See also the various sections below, which include many more deprecations.