From d3a622f8173c3c9cde4b29f7c984c7c48bfc18cc Mon Sep 17 00:00:00 2001 From: Alex Trotsenko Date: Thu, 23 Sep 2021 17:42:11 +0000 Subject: [PATCH] Revert "QProcess: do not emit aboutToClose() twice" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit efb90f6e7ed3e8d4f7b6c0fb96012cb3a9a9d037. Reason for revert: behavior change for signal listeners Change-Id: Ibe3c5d496cd61a9fccab17a10cc9fda8334fc9d4 Reviewed-by: Björn Schäpers Reviewed-by: Volker Hilsheimer --- src/corelib/io/qprocess.cpp | 1 + tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 6262c3d0db..0f2de9e1ff 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -1567,6 +1567,7 @@ qint64 QProcess::processId() const void QProcess::close() { Q_D(QProcess); + emit aboutToClose(); while (waitForBytesWritten(-1)) ; kill(); diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index e6e8f9c7bc..41f90de1e7 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -835,7 +835,6 @@ void tst_QProcess::closeReadChannel() void tst_QProcess::openModes() { QProcess proc; - QSignalSpy spyAboutToClose(&proc, &QProcess::aboutToClose); QVERIFY(!proc.isOpen()); QCOMPARE(proc.openMode(), QProcess::NotOpen); proc.start("testProcessEcho3/testProcessEcho3"); @@ -871,7 +870,6 @@ void tst_QProcess::openModes() QVERIFY(!proc.isOpen()); QVERIFY(!proc.isReadable()); QVERIFY(!proc.isWritable()); - QCOMPARE(spyAboutToClose.count(), 1); QCOMPARE(proc.state(), QProcess::NotRunning); }