summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2019-03-18 13:22:19 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2019-03-20 06:11:56 +0000
commit1134a36efa54c68736d708411423bafa9d0923f6 (patch)
tree732e12fc934a4afcefaa93b84b950082c4ea5b87
parentfdd988494aedba9f58b54e958fab91f566186ed1 (diff)
Relax tst_QQuickGridView::contentHeightWithDelayRemove
Apparently we cannot rely on the content height change to immediately take effect. Change-Id: I8b4bf7b7d0b72da84228c7a3f1460b42c97e0330 Fixes: QTBUG-74518 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r--tests/auto/quick/qquickgridview/tst_qquickgridview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index 301ec43cb5..e346e25aaf 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -6636,7 +6636,7 @@ void tst_QQuickGridView::contentHeightWithDelayRemove()
QCOMPARE(qRound(gridview->contentHeight()), qRound(initialContentHeight));
QTRY_COMPARE(qRound(gridview->contentHeight()), eventualContentHeight);
} else {
- QCOMPARE(qRound(gridview->contentHeight()), eventualContentHeight);
+ QTRY_COMPARE(qRound(gridview->contentHeight()), eventualContentHeight);
}
delete window;