diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-03-06 14:20:07 +0200 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2018-03-07 07:13:19 +0000 |
| commit | f49c55a50546bbc3202fc92977ab539ceea3c087 (patch) | |
| tree | 5e48f33098b0c1330e71f6c12d0623a24c9d7ddc /src/testlib/qtestsystem.h | |
| parent | 8abbb6ec725c41e08db8421f3e10b15b66ba28b1 (diff) | |
Revert "Make qWaitForWindowActive more robust"
This reverts commit 2eec3272c78a3af1e362906654aa6d50b33a4c50.
The change to qWaitForWindowActive causes regressions
in qtdeclarative, so we need a better fix for the problems
we have with window waiting.
Task-number: QTBUG-66866
Change-Id: I8300dabc870d6aeaa9ba6bfcf3d64146b13c1955
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/testlib/qtestsystem.h')
| -rw-r--r-- | src/testlib/qtestsystem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qtestsystem.h b/src/testlib/qtestsystem.h index 046fe1a3e7..79fe68004e 100644 --- a/src/testlib/qtestsystem.h +++ b/src/testlib/qtestsystem.h @@ -114,7 +114,7 @@ namespace QTest { bool becameActive = qWaitFor([&]() { return window->isActive(); }, timeout); - // Try ensuring the platform window receives the real position and geometry. + // Try ensuring the platform window receives the real position. // (i.e. that window->pos() reflects reality) // isActive() ( == FocusIn in case of X) does not guarantee this. It seems some WMs randomly // send the final ConfigureNotify (the one with the non-bogus 0,0 position) after the FocusIn. @@ -122,7 +122,7 @@ namespace QTest // qWaitForWindowShown() will generate bogus results. if (becameActive) { int waitNo = 0; // 0, 0 might be a valid position after all, so do not wait for ever - while (window->frameGeometry().isNull()) { + while (window->position().isNull()) { if (waitNo++ > timeout / 10) break; qWait(10); |