From 9648528ad6fbd66eeaae3189173a7d7b47b935ce Mon Sep 17 00:00:00 2001 From: Szabolcs David Date: Tue, 6 May 2014 02:04:08 -0700 Subject: Add test_baseUrlAfterLoadHtml QML test case Remove unreachableUrl support from WebContentsAdapter::setContent, because this argument behaves exactly the same as baseUrl. Change-Id: I36f92b99b7045c6d3b831481bb04d51a0e05772f Reviewed-by: Jocelyn Turcotte --- src/webenginewidgets/api/qwebenginepage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/webenginewidgets') diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 0006cbd42..2abfa4dec 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -763,7 +763,7 @@ void QWebEnginePage::setHtml(const QString &html, const QUrl &baseUrl) void QWebEnginePage::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl) { Q_D(QWebEnginePage); - d->adapter->setContent(data, mimeType, baseUrl, baseUrl); + d->adapter->setContent(data, mimeType, baseUrl); } QString QWebEnginePage::title() const -- cgit v1.2.3