diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-30 13:25:45 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-30 13:25:45 (GMT) |
| commit | 70fd09b335f60be7b68f258c47abe2bb092d5775 (patch) | |
| tree | cef95cddc6adad7d7efb2adb74e423e43ba04322 /src/corelib/thread | |
| parent | 6700a9f41692912f221fac55e4cae1809549fa13 (diff) | |
| parent | 8c65dc25962e167237c2573979b1dfff88c29326 (diff) | |
| download | Qt-70fd09b335f60be7b68f258c47abe2bb092d5775.zip Qt-70fd09b335f60be7b68f258c47abe2bb092d5775.tar.gz Qt-70fd09b335f60be7b68f258c47abe2bb092d5775.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qthread_unix.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/thread/qthread_win.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index 2824e15..a7601b6 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -514,6 +514,8 @@ void QThread::start(Priority priority) d->running = true; d->finished = false; d->terminated = false; + d->returnCode = 0; + d->exited = false; pthread_attr_t attr; pthread_attr_init(&attr); diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp index 37d5b87..f0cbe8d 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -405,6 +405,8 @@ void QThread::start(Priority priority) d->running = true; d->finished = false; d->terminated = false; + d->exited = false; + d->returnCode = 0; /* NOTE: we create the thread in the suspended state, set the |