diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-01-15 19:00:59 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-22 08:45:02 +0100 |
commit | e6b846f3800eed35d31a45122f7f8c3215dc38ef (patch) | |
tree | d8a167d8671fde146d3e0fafab3cb98e1a21fb56 /src/webenginewidgets | |
parent | 0d85992198886cfb2b55087bcf9fe2acb9da84de (diff) |
Implement QWebEnginePage::setHtml and setContent
Load a generated data: URL to carry the data.
This is not as efficient as it could be but the behavior matches and
this should be fine for now.
Change-Id: I26ad2e5976025a3044fb03f066074ce6dd34e575
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src/webenginewidgets')
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 12 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp | 10 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 74a1692b2..54abb4384 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -443,6 +443,18 @@ void QWebEnginePage::load(const QUrl& url) d->adapter->load(url); } +void QWebEnginePage::setHtml(const QString &html, const QUrl &baseUrl) +{ + Q_D(QWebEnginePage); + d->adapter->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); +} + QString QWebEnginePage::title() const { Q_D(const QWebEnginePage); diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 054925e83..fc72d1241 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -124,6 +124,16 @@ void QWebEngineView::load(const QUrl& url) page()->load(url); } +void QWebEngineView::setHtml(const QString& html, const QUrl& baseUrl) +{ + page()->setHtml(html, baseUrl); +} + +void QWebEngineView::setContent(const QByteArray& data, const QString& mimeType, const QUrl& baseUrl) +{ + page()->setContent(data, mimeType, baseUrl); +} + QWebEngineHistory* QWebEngineView::history() const { return page()->history(); |