diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:06:00 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:06:30 +0100 |
| commit | 36a42ed6b11dce102d0e0f93fbd441011b003157 (patch) | |
| tree | fee762b914cdd525601e5bde150da82a159d86e8 /src/qmltest | |
| parent | 9e11754fdceae18b49bf1b0947e48b5f81e85d59 (diff) | |
| parent | fc0e916784b88a3a9ad12263ecc617c0a383664e (diff) | |
Merge branch 'release' into stable
Change-Id: I88ecd5f396ecd9a9c910108d1cca832a3087f1d8
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/quicktest.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index f1f3c46f2d..1dc0e3fecb 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -339,7 +339,8 @@ int quick_test_main(int argc, char **argv, const char *name, const char *sourceD view->resize(200, 200); } view->show(); - if (qWaitForSignal(view, SIGNAL(frameSwapped()))) + QTest::qWaitForWindowExposed(view); + if (view->isExposed()) rootobj.setWindowShown(true); if (!rootobj.hasQuit && rootobj.hasTestCase()) eventLoop.exec(); |