diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-24 01:00:15 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-24 01:00:15 +0100 |
| commit | 73894987a22c9821c508c921f38a0db442559c71 (patch) | |
| tree | 15182a0090157a9b6621e2688ca6b44963962ee6 /src/qml/qml/qqmlxmlhttprequest.cpp | |
| parent | 8aa13799516bb412908a5612da5ea5ba0972b998 (diff) | |
| parent | 861f53d60cc2dd8bd8529c65863af881dbdd8db8 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I9f0d5adf1ba7d3246b1107a20d145e7aac2c7a77
Diffstat (limited to 'src/qml/qml/qqmlxmlhttprequest.cpp')
| -rw-r--r-- | src/qml/qml/qqmlxmlhttprequest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index 179d5314a8..416aca8667 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -1291,7 +1291,7 @@ void QQmlXMLHttpRequest::requestFromUrl(const QUrl &url) } else { QObject::connect(m_network, SIGNAL(readyRead()), this, SLOT(readyRead())); - QObject::connect(m_network, SIGNAL(error(QNetworkReply::NetworkError)), + QObject::connect(m_network, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(error(QNetworkReply::NetworkError))); QObject::connect(m_network, SIGNAL(finished()), this, SLOT(finished())); |