diff options
| -rw-r--r-- | src/corelib/io/qprocess.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 0702667042..75334cd27c 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -1565,7 +1565,6 @@ 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 41f90de1e7..e6e8f9c7bc 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -835,6 +835,7 @@ 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"); @@ -870,6 +871,7 @@ void tst_QProcess::openModes() QVERIFY(!proc.isOpen()); QVERIFY(!proc.isReadable()); QVERIFY(!proc.isWritable()); + QCOMPARE(spyAboutToClose.count(), 1); QCOMPARE(proc.state(), QProcess::NotRunning); } |