From 1134a36efa54c68736d708411423bafa9d0923f6 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 18 Mar 2019 13:22:19 +0100
Subject: 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>
---
 tests/auto/quick/qquickgridview/tst_qquickgridview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

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;
-- 
cgit v1.2.3