summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2020-02-24 16:06:48 +0000
committerTimur Pocheptsov <timur.pocheptsov@qt.io>2020-02-24 16:12:20 +0000
commitd5310efd2fbbe9786a4257f3ada78381cb54da23 (patch)
tree9db54618f953a4878310228957f5d5a000d557bf
parent00fe7a58b9b4ffe6caa7c3e14d5af40c824c0a80 (diff)
Revert "Use QNetworkReply::networkError() instead of deprecated error()"v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2
This reverts commit ed91358ec20bb96fe2eff1b9dfaf772c9b1dba5d. Naming in QProcess is considered to be the correct one and the rule. Change-Id: Iaca8e2661454ace9f73b0fbbae0bf429153f0268 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-rw-r--r--src/imports/winextras/qquickiconloader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/winextras/qquickiconloader.cpp b/src/imports/winextras/qquickiconloader.cpp
index 311a8c8..b5b7e5b 100644
--- a/src/imports/winextras/qquickiconloader.cpp
+++ b/src/imports/winextras/qquickiconloader.cpp
@@ -124,7 +124,7 @@ void QQuickIconLoaderNetworkReplyHandler::onRequestFinished()
{
auto *reply = qobject_cast<QNetworkReply *>(sender());
Q_ASSERT(reply);
- if (reply->networkError() != QNetworkReply::NoError) {
+ if (reply->error() != QNetworkReply::NoError) {
qWarning() << Q_FUNC_INFO << reply->url() << "failed:" << reply->errorString();
return;
}