summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-03 19:24:17 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-05-03 19:24:17 +0000
commit76004bcedbaac2cd7fe009767d1f4875648c8690 (patch)
tree8a694588c94c2118aff8427a531ee5a80ce08f57 /tests
parentb355aa1c02338a0d9c38beceb2cf8bc7d59f101a (diff)
parente6c64fa060906997af46d42f8ce768be9449534d (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index eb0c5910e..34ef42f89 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -3983,9 +3983,7 @@ void tst_QWebEnginePage::setHtmlWithImageResource()
page.setHtml(html);
waitForSignal(&page, SIGNAL(loadFinished(bool)));
QCOMPARE(evaluateJavaScriptSync(&page, "document.images.length").toInt(), 1);
- QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=118659", Continue);
QCOMPARE(evaluateJavaScriptSync(&page, "document.images[0].width").toInt(), 0);
- QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=118659", Continue);
QCOMPARE(evaluateJavaScriptSync(&page, "document.images[0].height").toInt(), 0);
}