diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-29 13:04:09 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-29 13:04:31 +0200 |
| commit | e6c64fa060906997af46d42f8ce768be9449534d (patch) | |
| tree | 0170d8ab4f26b686263ea8a5a0ee1f6b540628cd /tests | |
| parent | 42a422ff035d51f5a20e7b0024ea30e764b92097 (diff) | |
| parent | 8575d9aa489f4c9e839e3cb28b9f8c27acbdb425 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I922e637ffbf03aa15711fa5d0e10ecd4f25448ab
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 2 |
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); } |