summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-09 11:34:59 (GMT)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-09 11:34:59 (GMT)
commit00aeefeeaff4d8c3e25c6f388c5e51c239541f87 (patch)
tree265f1ff24e1628b8974b96ec1858cb462d4e4b3e /src/network
parent9b7a5241a287b71c1ab4a9cd9cd3d89c03136ced (diff)
parentb65fd82299689a1f353e16caa7d1c896b838762a (diff)
downloadQt-00aeefeeaff4d8c3e25c6f388c5e51c239541f87.zip
Qt-00aeefeeaff4d8c3e25c6f388c5e51c239541f87.tar.gz
Qt-00aeefeeaff4d8c3e25c6f388c5e51c239541f87.tar.bz2
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.h6
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
}