diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-15 01:00:30 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-15 01:00:30 +0200 |
| commit | c5c938055524b8b7e41ad361b0063f9ed1762044 (patch) | |
| tree | 6f2961ef872e33679e02c0d0ef82334381db93f3 /src/testlib/qtestcase.h | |
| parent | 8bd48a1c335b404ebbeb7c09c859e0715e6b5cd4 (diff) | |
| parent | 0d024bd0a63fa7a741f4f118a3b48806b695594f (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Id7954ada1f8658d3b1da5e8241a09f2d201a7c56
Diffstat (limited to 'src/testlib/qtestcase.h')
| -rw-r--r-- | src/testlib/qtestcase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 5d566b835e..19a7975750 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -153,7 +153,7 @@ do {\ #define QTRY_IMPL(expr, timeout)\ const int qt_test_step = timeout < 350 ? timeout / 7 + 1 : 50; \ const int qt_test_timeoutValue = timeout; \ - QTRY_LOOP_IMPL((expr), qt_test_timeoutValue, qt_test_step); \ + { QTRY_LOOP_IMPL((expr), qt_test_timeoutValue, qt_test_step); } \ QTRY_TIMEOUT_DEBUG_IMPL((expr), qt_test_timeoutValue, qt_test_step)\ // Will try to wait for the expression to become true while allowing event processing |