diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:04:51 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:04:57 +0100 |
| commit | 6a1c5e483f33e38e7527272d1cce859c46bba8e1 (patch) | |
| tree | 9f0265a29eb044e020e287910293054a1d7a67d0 /src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp | |
| parent | eaad31bcaccd7dd3e7e1cad755eb337092ad0266 (diff) | |
| parent | ff18ac06286c453acfd3929ebc806229cd1eb69f (diff) | |
| download | qtxmlpatterns-6a1c5e483f33e38e7527272d1cce859c46bba8e1.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp')
| -rw-r--r-- | src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp index e25a9b6..b41f80f 100644 --- a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp +++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp @@ -129,7 +129,7 @@ QNetworkReply *AccelTreeResourceLoader::load(const QUrl &uri, ftpNetworkLoop.exec(QEventLoop::ExcludeUserInputEvents); } - if (reply->error() != QNetworkReply::NoError) { + if (reply->networkError() != QNetworkReply::NoError) { const QString errorMessage(escape(reply->errorString())); /* Note, we delete reply before we exit this function with error(). */ |