diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-01-24 18:04:55 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-12 17:13:31 +0100 |
| commit | bf65a7dcad419ed8d7e504a3ceece56cd7afa1e4 (patch) | |
| tree | 3e0025c6a61148456676a51f30588e4c9d170645 /src/webenginewidgets/api/qwebenginepage.cpp | |
| parent | e599e1f018f23fcd3089a87fdbf09496724122ce (diff) | |
Fix tst_QWebEngineFrame::baseUrl
Update tests to check that we can keep the same functionality by
querying document.baseURI through runJavaScript instead of implementing
QWebEnginePage::baseUrl.
This also removes QWebEnginePage::baseUrl from the header.
Change-Id: I549e57d3986e22986438f8a23e469bbd220633b7
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index e95433747..11cb7dbc5 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -522,13 +522,13 @@ void QWebEnginePage::toPlainText(const QWebEngineCallback<const QString &> &resu void QWebEnginePage::setHtml(const QString &html, const QUrl &baseUrl) { Q_D(QWebEnginePage); - d->adapter->setContent(html.toUtf8(), QStringLiteral("text/html;charset=UTF-8"), baseUrl); + setContent(html.toUtf8(), QStringLiteral("text/html;charset=UTF-8"), baseUrl); } void QWebEnginePage::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl) { Q_D(QWebEnginePage); - d->adapter->setContent(data, mimeType, baseUrl); + d->adapter->setContent(data, mimeType, baseUrl, baseUrl); } QString QWebEnginePage::title() const |