diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2014-05-06 02:04:08 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-08 15:31:02 +0200 |
| commit | 9648528ad6fbd66eeaae3189173a7d7b47b935ce (patch) | |
| tree | 8d420f17d0be7077517e5e257adfe98773ab41f3 /src/webenginewidgets/api/qwebenginepage.cpp | |
| parent | 388a71d66f31df999dc9259d4eb156c497ad5247 (diff) | |
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 <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |