diff options
| author | aavit <qt-info@nokia.com> | 2011-04-26 08:28:04 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-04-26 08:28:04 (GMT) |
| commit | ff8c99eb54f33108709f9f3107b35780a80f3f17 (patch) | |
| tree | 11d4c08809bf90fd8b25b175b4903ab00d36e3d6 /src/testlib/qabstracttestlogger.cpp | |
| parent | 28c7e17d9eeb8264ad9e26a5b93e5ff744add9a6 (diff) | |
| parent | 7ef9f99301a7c71fdb835f9e1f27d3111557aa2e (diff) | |
| download | Qt-ff8c99eb54f33108709f9f3107b35780a80f3f17.zip Qt-ff8c99eb54f33108709f9f3107b35780a80f3f17.tar.gz Qt-ff8c99eb54f33108709f9f3107b35780a80f3f17.tar.bz2 | |
Merge remote branch 'qt-mainline/master'
Conflicts:
configure
Diffstat (limited to 'src/testlib/qabstracttestlogger.cpp')
| -rw-r--r-- | src/testlib/qabstracttestlogger.cpp | 10 |
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; } |