summaryrefslogtreecommitdiffstats
path: root/examples/embedded/lightmaps/slippymap.cpp
diff options
context:
space:
mode:
authorAlexander Akulich <akulichalexander@gmail.com>2020-02-10 12:29:57 +0300
committerAlexander Akulich <akulichalexander@gmail.com>2020-02-28 07:21:14 +0300
commit4c86e667d220e27bb4b6e370675ffb2872e8521c (patch)
tree4a3a01fa04bd428210f7ed61d5e47b9754eba36b /examples/embedded/lightmaps/slippymap.cpp
parentc2a13ae501776e621e21a33a8b04af038704bfdd (diff)
Revert "QNetworkReply: deprecate the 'error' getter"
This reverts commit ccb2cb84f535b0bfce19a95d7f3a36803480cae8 and commit 0f568d0a671e9f0667a1b47ffa6fbb9f7a10d9f5. The patches fix ambiguity between a getter and a signal by changing the getter name, but we still have to rename the signal to follow the signals naming convention. Revert the commits to keep the getter as is and change the signal name instead. Change-Id: Iddbab7c33eea03826ae7c114a01857ed45bde6db Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'examples/embedded/lightmaps/slippymap.cpp')
-rw-r--r--examples/embedded/lightmaps/slippymap.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/embedded/lightmaps/slippymap.cpp b/examples/embedded/lightmaps/slippymap.cpp
index dfc21862fb..da003981ff 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->networkError())
+ if (!reply->error())
if (!img.load(reply, 0))
img = QImage();
reply->deleteLater();