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 /examples/embedded | |
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 'examples/embedded')
-rw-r--r-- | examples/embedded/flightinfo/flightinfo.cpp | 2 | ||||
-rw-r--r-- | examples/embedded/lightmaps/slippymap.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/embedded/flightinfo/flightinfo.cpp b/examples/embedded/flightinfo/flightinfo.cpp index f46fc9693f..732e07583a 100644 --- a/examples/embedded/flightinfo/flightinfo.cpp +++ b/examples/embedded/flightinfo/flightinfo.cpp @@ -144,7 +144,7 @@ public: private slots: void handleNetworkData(QNetworkReply *networkReply) { - if (!networkReply->error()) { + if (!networkReply->networkError()) { if (!mapReplies.contains(networkReply)) { // Assume UTF-8 encoded QByteArray data = networkReply->readAll(); diff --git a/examples/embedded/lightmaps/slippymap.cpp b/examples/embedded/lightmaps/slippymap.cpp index da003981ff..dfc21862fb 100644 --- a/examples/embedded/lightmaps/slippymap.cpp +++ b/examples/embedded/lightmaps/slippymap.cpp @@ -162,7 +162,7 @@ void SlippyMap::handleNetworkData(QNetworkReply *reply) { QImage img; QPoint tp = reply->request().attribute(QNetworkRequest::User).toPoint(); - if (!reply->error()) + if (!reply->networkError()) if (!img.load(reply, 0)) img = QImage(); reply->deleteLater(); |