diff --git a/src/network/access/qnetworkfile.cpp b/src/network/access/qnetworkfile.cpp index fb9ce8232d7..fa8168c0f0a 100644 --- a/src/network/access/qnetworkfile.cpp +++ b/src/network/access/qnetworkfile.cpp @@ -30,7 +30,7 @@ void QNetworkFile::open() if (fi.isDir()) { QString msg = QCoreApplication::translate("QNetworkAccessFileBackend", "Cannot open %1: Path is a directory").arg(fileName()); - emit error(QNetworkReply::ContentOperationNotPermittedError, msg); + emit networkError(QNetworkReply::ContentOperationNotPermittedError, msg); } else { emit headerRead(QHttpHeaders::WellKnownHeader::LastModified, QNetworkHeadersPrivate::toHttpDate(fi.lastModified())); @@ -41,9 +41,9 @@ void QNetworkFile::open() QString msg = QCoreApplication::translate("QNetworkAccessFileBackend", "Error opening %1: %2").arg(fileName(), errorString()); if (exists()) - emit error(QNetworkReply::ContentAccessDenied, msg); + emit networkError(QNetworkReply::ContentAccessDenied, msg); else - emit error(QNetworkReply::ContentNotFoundError, msg); + emit networkError(QNetworkReply::ContentNotFoundError, msg); } } emit finished(opened); diff --git a/src/network/access/qnetworkfile_p.h b/src/network/access/qnetworkfile_p.h index 9dcb63711e8..d709563c393 100644 --- a/src/network/access/qnetworkfile_p.h +++ b/src/network/access/qnetworkfile_p.h @@ -36,7 +36,7 @@ public Q_SLOTS: Q_SIGNALS: void finished(bool ok); void headerRead(QHttpHeaders::WellKnownHeader, const QByteArray &value); - void error(QNetworkReply::NetworkError error, const QString &message); + void networkError(QNetworkReply::NetworkError error, const QString &message); }; QT_END_NAMESPACE diff --git a/src/network/access/qnetworkreplyfileimpl.cpp b/src/network/access/qnetworkreplyfileimpl.cpp index bad0bb7b0ac..b220cff7283 100644 --- a/src/network/access/qnetworkreplyfileimpl.cpp +++ b/src/network/access/qnetworkreplyfileimpl.cpp @@ -87,7 +87,7 @@ QNetworkReplyFileImpl::QNetworkReplyFileImpl(QNetworkAccessManager *manager, con auto realFile = new QNetworkFile(fileName); connect(realFile, &QNetworkFile::headerRead, this, &QNetworkReplyFileImpl::setWellKnownHeader, Qt::QueuedConnection); - connect(realFile, &QNetworkFile::error, this, &QNetworkReplyFileImpl::setError, + connect(realFile, &QNetworkFile::networkError, this, &QNetworkReplyFileImpl::setError, Qt::QueuedConnection); connect(realFile, SIGNAL(finished(bool)), SLOT(fileOpenFinished(bool)), Qt::QueuedConnection);