diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-09 01:00:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-09 13:06:11 +0000 |
| commit | e56d3b03ed92743f33eb7ca1a5aa61dbdedaf19b (patch) | |
| tree | c29a80a940cca1281014732aff4237c915f32dc4 /tests/auto/testlib/selftests/expected_sleep.txt | |
| parent | 2a79af6b5c67eba6f967c7443bf73bbe11206a62 (diff) | |
| parent | 9444416a46ee0e6bb0d9d9be9a4883b388644c59 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/corelib/tools/qlocale_data_p.h
(Regenerated by running the scripts in util/local_database/)
src/gui/opengl/qopengltextureuploader.cpp
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: I12df7f066ed0a25eb109f61c4b8d8dea63b683e2
Diffstat (limited to 'tests/auto/testlib/selftests/expected_sleep.txt')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_sleep.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/testlib/selftests/expected_sleep.txt b/tests/auto/testlib/selftests/expected_sleep.txt index d18c3212bb..d1701d2bed 100644 --- a/tests/auto/testlib/selftests/expected_sleep.txt +++ b/tests/auto/testlib/selftests/expected_sleep.txt @@ -2,6 +2,7 @@ Config: Using QtTest library PASS : tst_Sleep::initTestCase() PASS : tst_Sleep::sleep() +PASS : tst_Sleep::wait() PASS : tst_Sleep::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +Totals: 4 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Sleep ********* |