diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-17 07:11:26 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-17 07:12:23 +0100 |
| commit | f596553e03c3969f6e7cb5344c05591da6e70dfb (patch) | |
| tree | 8aef667749e1adc015cbc9c5ec5b5af9c6d4c15c /src/qmltest/quicktest.cpp | |
| parent | e32845b137834ef46d68345a0029d4af7c1d85bb (diff) | |
| parent | 7030adff1869e850a7b983e88d7a773d5d594886 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/imports/dialogs/DefaultFileDialog.qml
src/imports/widgets/qquickqfiledialog.cpp
Change-Id: I00de6dd05cb773f01254061d585a82c90b229acd
Diffstat (limited to 'src/qmltest/quicktest.cpp')
| -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()) |