Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-network into symbian-socket-engine

Conflicts:
	src/network/access/qnetworkaccessmanager.cpp
	tests/auto/qsslsocket/tst_qsslsocket.cpp

1 files changed, 9 insertions, 1 deletions

diff --git a/src/testlib/qabstracttestlogger.cpp b/src/testlib/qabstracttestlogger.cpp
index e42e0c4..c2e53e6 100644
--- a/src/testlib/qabstracttestlogger.cpp
+++ b/src/testlib/qabstracttestlogger.cpp
@@ -104,8 +104,16 @@ void QAbstractTestLogger::startLogging()
 void QAbstractTestLogger::stopLogging()
 {
     QTEST_ASSERT(QTest::stream);
-    if (QTest::stream != stdout)
+    if (QTest::stream != stdout) {
         fclose(QTest::stream);
+    } else {
+#ifdef Q_OS_SYMBIAN
+        // Convenience sleep for Symbian and TRK. Without this sleep depending on the timing the
+        // user would not see the complete output because it is still pending in any of the buffers
+        // before arriving via the USB port on the development PC
+        User::AfterHighRes(2*1000*1000);
+#endif
+    }
     QTest::stream = 0;
 }