summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-12-04 15:41:19 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-12-04 15:41:19 +0100
commitca08e3ab5dd250581911f2a58185443aed91ee92 (patch)
treec6480688db34f2806b90afe3f696782bfdb34ef9 /tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp
parentcc2b1d2b66806a67f13996cbb8631d5ea8cdf71a (diff)
parentd366f1d5d37ce6f1833ac67c7ebda540b16690f2 (diff)
Merge remote-tracking branch 'origin/5.14.0' into 5.14
Diffstat (limited to 'tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp')
-rw-r--r--tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp b/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp
index 1469ddb15..46038cdc6 100644
--- a/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp
+++ b/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp
@@ -522,10 +522,10 @@ void tst_FaviconManager::touchIconWithSameURL()
"<link rel='icon' type='image/png' href='" + icon + "'/>"
"<link rel='apple-touch-icon' type='image/png' href='" + icon + "'/>"
"</html>");
- QTRY_COMPARE(loadFinishedSpy.count(), 1);
+ QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
// The default favicon has to be loaded even if its URL is also set as a touch icon while touch icons are disabled.
- QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+ QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
QCOMPARE(m_page->iconUrl().toString(), icon);
QTRY_COMPARE(iconChangedSpy.count(), 1);