From 4c86e667d220e27bb4b6e370675ffb2872e8521c Mon Sep 17 00:00:00 2001 From: Alexander Akulich Date: Mon, 10 Feb 2020 12:29:57 +0300 Subject: Revert "QNetworkReply: deprecate the 'error' getter" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- examples/embedded/lightmaps/slippymap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/embedded/lightmaps/slippymap.cpp') 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(); -- cgit v1.2.3