diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-03-23 13:33:57 +0100 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-03-23 12:41:54 +0000 |
commit | 72f5b40b00178710b36edc7ed1769321182e7fa6 (patch) | |
tree | 9f58423590e0f54e4b0070ccd2dbf77d6064b406 | |
parent | 1afc99397bd35fc3cd24913f5dc10743de1833dc (diff) |
QNetworkReply: Fix warnings from deprecated error signalv5.15.0-beta4v5.15.0-beta3
And update old-style connect even if there's no warning
Task-number: QTBUG-82605
Change-Id: Ia12fe93a43fac24017faf55b931ad28ae959f245
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
-rw-r--r-- | src/oauth/qoauth1.cpp | 2 | ||||
-rw-r--r-- | tests/auto/oauth1/tst_oauth1.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/oauth/qoauth1.cpp b/src/oauth/qoauth1.cpp index 8063b2e..1082ce9 100644 --- a/src/oauth/qoauth1.cpp +++ b/src/oauth/qoauth1.cpp @@ -212,7 +212,7 @@ QNetworkReply *QOAuth1Private::requestToken(QNetworkAccessManager::Operation ope reply = networkAccessManager()->post(request, data); } - connect(reply, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), + connect(reply, &QNetworkReply::errorOccurred, this, &QOAuth1Private::_q_onTokenRequestError); QAbstractOAuthReplyHandler *handler = replyHandler ? replyHandler.data() diff --git a/tests/auto/oauth1/tst_oauth1.cpp b/tests/auto/oauth1/tst_oauth1.cpp index b68491b..ad4d976 100644 --- a/tests/auto/oauth1/tst_oauth1.cpp +++ b/tests/auto/oauth1/tst_oauth1.cpp @@ -199,7 +199,7 @@ int tst_OAuth1::waitForFinish(QNetworkReplyPtr &reply) int count = 0; connect(reply, SIGNAL(finished()), SLOT(finished())); - connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(gotError())); + connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), SLOT(gotError())); returnCode = Success; loop = new QEventLoop; QSignalSpy spy(reply.data(), SIGNAL(downloadProgress(qint64,qint64))); |