summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2020-01-14 10:24:38 +0100
committerTimur Pocheptsov <timur.pocheptsov@qt.io>2020-01-14 10:32:51 +0100
commit0f568d0a671e9f0667a1b47ffa6fbb9f7a10d9f5 (patch)
treee1d9dd546d26f3b8e1441b5a774f0805a758a56f /src
parentf494e8b58d8a02508d2809b29b0bd0019018965a (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/network/access/qnetworkreply.cpp2
-rw-r--r--src/network/access/qnetworkreply.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index 0a5a17a3b8..c22dce8f1c 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -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)
/*!
diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h
index 1bcb6d9680..139009a56a 100644
--- a/src/network/access/qnetworkreply.h
+++ b/src/network/access/qnetworkreply.h
@@ -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;