diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-02-28 11:15:01 +0000 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-02-28 12:46:44 +0000 |
| commit | e0bbea53f92648e004b162428e36dcdd8cf95cf1 (patch) | |
| tree | c7e883e6dd2dddf9711f7f412d81873fc7a35244 /src/qml/jsruntime | |
| parent | 391bd68b4045268b389780f4b08d2f07951b45bf (diff) | |
Revert "error -> networkError to fix deprecation warning"
This reverts commit 391bd68b4045268b389780f4b08d2f07951b45bf.
Reason for revert: this warning is only temporary, the patch fixing it
- is coming. But the original change of error->networkError
was reverted in 5.15 to make the new patch, changing signal name instead,
work. Now qtdeclarative does not compile - it calls non-existing function.
Change-Id: I276562564c8954f67dcdf4fd5d08afd5f3f9dc8b
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4include.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp index 64ca719e29..92face6f94 100644 --- a/src/qml/jsruntime/qv4include.cpp +++ b/src/qml/jsruntime/qv4include.cpp @@ -163,7 +163,7 @@ void QV4Include::finished() QV4::Scope scope(v4); QV4::ScopedObject resultObj(scope, m_resultObject.value()); QV4::ScopedString status(scope, v4->newString(QStringLiteral("status"))); - if (m_reply->networkError() == QNetworkReply::NoError) { + if (m_reply->error() == QNetworkReply::NoError) { QByteArray data = m_reply->readAll(); QString code = QString::fromUtf8(data); |