diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 12:34:59 +0100 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 12:34:59 +0100 |
| commit | 00aeefeeaff4d8c3e25c6f388c5e51c239541f87 (patch) | |
| tree | 265f1ff24e1628b8974b96ec1858cb462d4e4b3e /src/network | |
| parent | 9b7a5241a287b71c1ab4a9cd9cd3d89c03136ced (diff) | |
| parent | b65fd82299689a1f353e16caa7d1c896b838762a (diff) | |
Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6
Conflicts:
configure.exe
src/corelib/io/qfsfileengine.cpp
tests/auto/qfile/tst_qfile.cpp
Diffstat (limited to 'src/network')
| -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 64c51527b0..afd3570e4c 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 } |