diff options
author | Albert Astals Cid <albert.astals@canonical.com> | 2014-01-16 11:55:54 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-16 17:47:47 +0100 |
commit | 05b6dc8d4d4e8f8e8c8d578d8ae4432e6d736445 (patch) | |
tree | 05f82cd94d3dbad1922cd91e66aded2383a7aad3 /src/qmltest | |
parent | acd0baf6428601b7eab9f96eff559c27909f073e (diff) |
Make sure the test window has focus
Some setups like xvfb-run under Linux do not focus windows
after showing them, this means that any focus based test will
fail since the windows itself is unfocused. This makes sure
the test window will be shown and focused.
Change-Id: I1903b7cdf88b772e1ca15acd4899695b49615712
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
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 c210c21288..bb6eec3706 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -365,7 +365,8 @@ int quick_test_main(int argc, char **argv, const char *name, const char *sourceD view->resize(200, 200); } view->show(); - QTest::qWaitForWindowExposed(view); + view->requestActivate(); + QTest::qWaitForWindowActive(view); if (view->isExposed()) QTestRootObject::instance()->setWindowShown(true); if (!QTestRootObject::instance()->hasQuit && QTestRootObject::instance()->hasTestCase()) |