From d35c2219836277708d6fd7dc9a892e9ccd7b9aa8 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 19 Mar 2024 18:31:28 +0100 Subject: tst_QNetworkReply: don't use deleteLater() on QSignalSpies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Turn the QSignalSpy deletions from deferred (via deleteLater()) into immediate ones. This is ok: QSignalSpy is using itself as a context object in QMetaObject::connect(), so the connection thus established to the monitored signal will be atomically severed if either sender or receiver are destroyed. There never was a need to defer deletion of the signal spy, so don't. Found by making QSignalSpy's inheritance from QObject private. Pick-to: 6.5 Change-Id: I962d28c3a78f356d234324fed68716f2f1052100 Reviewed-by: Mårten Nordheim (cherry picked from commit eefd8ab1e8e4d6afa64e15c017e1e78fd30c7382) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit b7dd49682bf0cfe205ef774b075a5d98aea84616) --- tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 98d4cc37f5..d0c9c4f47d 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -8430,9 +8430,9 @@ void tst_QNetworkReply::emitErrorForAllReplies() // QTBUG-36890 for (int a = 0; a < urls.size(); ++a) { QVERIFY(replies.at(a)->isFinished()); QCOMPARE(errorSpies.at(a)->size(), 1); - errorSpies.at(a)->deleteLater(); + delete errorSpies.at(a); QCOMPARE(finishedSpies.at(a)->size(), 1); - finishedSpies.at(a)->deleteLater(); + delete finishedSpies.at(a); replies.at(a)->deleteLater(); } } -- cgit v1.2.3