diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-02-24 17:26:41 +0000 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-02-24 17:47:39 +0000 |
| commit | 8dcd51b63d26fcac466d80dc90942ae2cf3b4f4e (patch) | |
| tree | 879d3b3dfede4954d4cf7770cf55d88329120dcd /src/quick | |
| parent | 033154229442e19bc675ab69015d460fe3aee775 (diff) | |
Revert "Replace call to deprecated QNetworkReply::error method"
This reverts commit e5a4ba4a5573ace08def218b985dde83de0805fb.
Reason for revert: it was decided to re-name a signal instead, like it's done in QProcess.
Change-Id: I0f393c482d8be506430258d7afd4a0056611831f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickborderimage.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickfontloader.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickpixmapcache.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp index 32407a474f..3679df37d1 100644 --- a/src/quick/items/qquickborderimage.cpp +++ b/src/quick/items/qquickborderimage.cpp @@ -478,7 +478,7 @@ void QQuickBorderImage::sciRequestFinished() } d->redirectCount=0; - if (d->sciReply->networkError() != QNetworkReply::NoError) { + if (d->sciReply->error() != QNetworkReply::NoError) { d->status = Error; d->sciReply->deleteLater(); d->sciReply = nullptr; diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp index 505c70df7c..2de9768243 100644 --- a/src/quick/util/qquickfontloader.cpp +++ b/src/quick/util/qquickfontloader.cpp @@ -121,7 +121,7 @@ void QQuickFontObject::replyFinished() } redirectCount = 0; - if (!reply->networkError()) { + if (!reply->error()) { id = QFontDatabase::addApplicationFontFromData(reply->readAll()); if (id != -1) emit fontDownloaded(QFontDatabase::applicationFontFamilies(id).at(0), QQuickFontLoader::Ready); diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index 8846edcd44..d96ebe70b2 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -578,7 +578,7 @@ void QQuickPixmapReader::networkRequestDone(QNetworkReply *reply) QQuickPixmapReply::ReadError error = QQuickPixmapReply::NoError; QString errorString; QSize readSize; - if (reply->networkError()) { + if (reply->error()) { error = QQuickPixmapReply::Loading; errorString = reply->errorString(); } else { |