diff options
| author | mread <qt-info@nokia.com> | 2009-08-05 09:32:17 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-05 09:32:17 (GMT) |
| commit | 638edc80e3b224a6830dda0a2bd3097cb82dcb96 (patch) | |
| tree | bdbb6a19e69f1388abcd032c1795ac87b13ceec1 /src/corelib/thread/qthread.cpp | |
| parent | 867bcdcce78acca9fde2ffc57e6a304cd2e25517 (diff) | |
| parent | acd877fbff4a0c785143fcc891eae73f5b986ff9 (diff) | |
| download | Qt-638edc80e3b224a6830dda0a2bd3097cb82dcb96.zip Qt-638edc80e3b224a6830dda0a2bd3097cb82dcb96.tar.gz Qt-638edc80e3b224a6830dda0a2bd3097cb82dcb96.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/thread/qthread.cpp')
| -rw-r--r-- | src/corelib/thread/qthread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index fac50ee..a4a57ce 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -183,7 +183,7 @@ QThreadPrivate::QThreadPrivate(QThreadData *d) id = 0; waiters = 0; #endif -#if defined (Q_WS_WIN) || defined (Q_OS_SYMBIAN) +#if defined (Q_WS_WIN) || defined (Q_OS_SYMBIAN) terminationEnabled = true; terminatePending = false; #endif |