diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2012-10-19 00:33:03 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-19 20:25:16 +0200 |
commit | d7e8b57d0a98696a05cfb0eb15236a34301d9d0a (patch) | |
tree | 31926a55d022a399ae09eb85ad41a5e369d80215 /tests/auto/corelib/thread | |
parent | 39eaff6773fc4f05fc95473b769b3a2f0301e12b (diff) |
Remove the QThread::terminated() signal
The signal is removed from the API; all references to it are removed
from documentation; the unit test that checks for its emission is
modified to listen for QThread::finished() instead.
The QThreadPrivate::terminated flag is also removed, as it served no
purpose other than to trigger the emission of QThread::terminated()
As discussed at http://lists.qt-project.org/pipermail/development/2012-October/007216.html
the signal is not guaranteed to be emitted after every termination,
rendering it useless.
Change-Id: I7b0c45d7889da0d33875545331606f2208ee56fc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests/auto/corelib/thread')
-rw-r--r-- | tests/auto/corelib/thread/qthread/tst_qthread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index d7b810858d..bdfb980357 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -77,7 +77,7 @@ private slots: void quit(); void started(); void finished(); - void terminated(); + void terminated(); // Named after a signal that was removed in Qt 5.0 void exec(); void sleep(); void msleep(); @@ -535,7 +535,7 @@ void tst_QThread::terminated() { SignalRecorder recorder; Terminate_Thread thread; - connect(&thread, SIGNAL(terminated()), &recorder, SLOT(slot()), Qt::DirectConnection); + connect(&thread, SIGNAL(finished()), &recorder, SLOT(slot()), Qt::DirectConnection); { QMutexLocker locker(&thread.mutex); thread.start(); |