diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 14:08:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 14:08:53 (GMT) |
| commit | 571f0dc0a33b22bfc1f1ffd4521e7c4e5151647c (patch) | |
| tree | 88f85beb8700ce745738a19417aca30f3743ca6b /src/corelib | |
| parent | b7ba409b0dabd382876310a6c110a96cf0e3c6bf (diff) | |
| parent | 3263e0d971ac263e42078064b3f275dff4f62650 (diff) | |
| download | Qt-571f0dc0a33b22bfc1f1ffd4521e7c4e5151647c.zip Qt-571f0dc0a33b22bfc1f1ffd4521e7c4e5151647c.tar.gz Qt-571f0dc0a33b22bfc1f1ffd4521e7c4e5151647c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix warning on MSVC
QThread: make sure start works even if called after exit
Revert "Fixed painter path drawing on FBO without stencil buffer."
Fix a crash with D&d on mingw
Revert "Keep other text format with QTextOption::SuppressColors tag on"
Fixed stencil buffer on FBOs with OpenGL ES.
Keep other text format with QTextOption::SuppressColors tag on
QTreeView: do not scroll to top if last item is removed
Diffstat (limited to 'src/corelib')
| -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 |