Merge remote branch 'qt-mainline/master'

Conflicts:
	configure

2 files changed, 11 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;
 }
 
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 287d8e6..9a0d087 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1865,6 +1865,8 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
              IOPMAssertionRelease(powerID);
          }
 #endif
+         currentTestObject = 0;
+
          // Rethrow exception to make debugging easier.
          throw;
          return 1;