diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-11 04:53:53 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-11 04:53:53 (GMT) |
| commit | 48ac542fbeb654d095f14363156a26364c74c006 (patch) | |
| tree | 78ce1dc0eef7d9166c077171a21f3abc08c81d3e | |
| parent | 13d957cc16dcb97942fe1f5f3c724e7aeec1fee6 (diff) | |
| download | Qt-48ac542fbeb654d095f14363156a26364c74c006.zip Qt-48ac542fbeb654d095f14363156a26364c74c006.tar.gz Qt-48ac542fbeb654d095f14363156a26364c74c006.tar.bz2 | |
Apply manually.
| -rw-r--r-- | src/network/kernel/qhostinfo_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index 64c5152..afd3570 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -161,9 +161,11 @@ public Q_SLOTS: cond.wakeOne(); } #ifndef QT_NO_THREAD - if (!wait(QHOSTINFO_THREAD_WAIT)) + if (!wait(QHOSTINFO_THREAD_WAIT)) { terminate(); - wait(); + // Don't wait forever; see QTBUG-5296. + wait(QHOSTINFO_THREAD_WAIT); + } #endif } |