diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-15 01:00:59 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-01-15 10:14:05 +0100 |
| commit | d14fd32d403bd8d120fbe92dae06e9cb187c01c8 (patch) | |
| tree | fbcae21f765b48e0359f9fb303554172caa5a83c /src/network/access/qnetworkreply.h | |
| parent | 96dea48c154e5971593582f92917db3b3f17c7fa (diff) | |
| parent | 2cbc5f6f7ae8ba580126a7cafc1898377c2a2407 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/network/access/spdy/tst_spdy.cpp
Change-Id: I3196c5f7b34f2ffc9ef1e690d02d5b9bb3270a74
Diffstat (limited to 'src/network/access/qnetworkreply.h')
| -rw-r--r-- | src/network/access/qnetworkreply.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index 4a402daa91..139009a56a 100644 --- a/src/network/access/qnetworkreply.h +++ b/src/network/access/qnetworkreply.h @@ -124,7 +124,12 @@ public: QNetworkAccessManager *manager() const; QNetworkAccessManager::Operation operation() const; QNetworkRequest request() const; - NetworkError error() const; + +#if QT_DEPRECATED_SINCE(5, 15) + QT_DEPRECATED_X("Use networkError()") NetworkError error() const; +#endif // QT_DEPRECATED_SINCE(5, 15) + NetworkError networkError() const; + bool isFinished() const; bool isRunning() const; QUrl url() const; |