diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:43:36 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:46:48 +0200 |
commit | 8fc4f99e468a279e6bb8442adad6b6a46d1be1c3 (patch) | |
tree | dfd0540ecac0bc86594e9e997d7e979e40dacc6d /src/corelib/thread/qthread.cpp | |
parent | d3921cce47f834dd37cf0bb4085ba242dbbe2412 (diff) | |
parent | f7241e8cb949ecf2d86fae2a759a8e1fdb148a26 (diff) |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: If2168c519daf45390af04af9ef9722770453a493
Diffstat (limited to 'src/corelib/thread/qthread.cpp')
-rw-r--r-- | src/corelib/thread/qthread.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 5949f9aefe..72bae48eba 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -323,7 +323,8 @@ QThreadPrivate::~QThreadPrivate() /*! \fn void QThread::started() - This signal is emitted when the thread starts executing. + This signal is emitted from the associated thread when it starts executing, + before the run() function is called. \sa finished(), terminated() */ @@ -331,7 +332,14 @@ QThreadPrivate::~QThreadPrivate() /*! \fn void QThread::finished() - This signal is emitted when the thread has finished executing. + This signal is emitted from the associated thread right before it finishes executing. + + When this signal is emitted, the event loop has already stopped running. + No more events will be processed in the thread, except for deferred deletion events. + This signal can be connected to QObject::deleteLater(), to free objects in that thread. + + \note If the associated thread was terminated using terminate(), it is undefined from + which thread this signal is emitted. \sa started(), terminated() */ @@ -341,6 +349,8 @@ QThreadPrivate::~QThreadPrivate() This signal is emitted when the thread is terminated. + It is undefined from which thread this signal is emitted. + \sa started(), finished() */ |