summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtestsystem.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-03-08 09:27:37 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-03-08 09:27:38 +0100
commit332ce6734d29fb03852d04de6bc648289ff1c35d (patch)
tree30713dba37e3a98c7606c18f044ab4a815863288 /src/testlib/qtestsystem.h
parent2056bc6bc51efa1da61098ba3d213a4e25d9e7d8 (diff)
parentcaa5a20479bd58fda4380181691f772a1f3c1da4 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/testlib/qtestsystem.h')
-rw-r--r--src/testlib/qtestsystem.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qtestsystem.h b/src/testlib/qtestsystem.h
index a6cea26884..de6bd177d3 100644
--- a/src/testlib/qtestsystem.h
+++ b/src/testlib/qtestsystem.h
@@ -112,7 +112,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.
@@ -120,7 +120,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);