diff options
| author | axis <qt-info@nokia.com> | 2009-11-10 12:02:51 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-10 12:02:51 (GMT) |
| commit | b8e8fa9aa4684c345ec55cc41f690e78f9b4a3c0 (patch) | |
| tree | 7c79470413a171e2ad43e8fe7730e2e74770ca32 /src/network/kernel/qhostinfo_p.h | |
| parent | 0ce94a763cfa9ec0829e096795a52446c74e4557 (diff) | |
| parent | 99f4379d397eacbdcffc40d6906175aa04d78456 (diff) | |
| download | Qt-b8e8fa9aa4684c345ec55cc41f690e78f9b4a3c0.zip Qt-b8e8fa9aa4684c345ec55cc41f690e78f9b4a3c0.tar.gz Qt-b8e8fa9aa4684c345ec55cc41f690e78f9b4a3c0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'src/network/kernel/qhostinfo_p.h')
| -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 } |