summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2010-11-26 17:07:56 (GMT)
committerPeter Hartmann <peter.hartmann@nokia.com>2010-11-26 17:10:05 (GMT)
commit86ddcd84dc13618cf27ae899f136d8fd138e4b26 (patch)
tree6db90032dd591f35b34a330d15a715947259b6fd
parent4e6cc34b75fd42d663ced0f3da1c9a9a6950fb6f (diff)
downloadQt-86ddcd84dc13618cf27ae899f136d8fd138e4b26.zip
Qt-86ddcd84dc13618cf27ae899f136d8fd138e4b26.tar.gz
Qt-86ddcd84dc13618cf27ae899f136d8fd138e4b26.tar.bz2
QNetworkReply autotest: fix possible crash
... by waiting for the thread to finish. Reviewed-by: Markus Goetz
-rw-r--r--tests/auto/qnetworkreply/tst_qnetworkreply.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 90416f2..9cf61f9 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -4490,6 +4490,7 @@ void tst_QNetworkReply::httpProxyCommandsSynchronous()
QVERIFY(reply->isFinished()); // synchronous
manager.setProxy(QNetworkProxy());
serverThread.quit();
+ serverThread.wait(3000);
//qDebug() << reply->error() << reply->errorString();