diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2014-02-05 08:40:38 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-11 19:31:25 +0100 |
| commit | f2cd2e0a32e8da3a0fbff6271dd9c257d8e8867f (patch) | |
| tree | 191ffa3d55e4edbd7a1dce46a17328b4997830a0 /src/webengine | |
| parent | 45e3f34fba7f499d58352951d8e8777c47c229d2 (diff) | |
Implement loadHtml function for QQuickWebEngineView
Implement unreachableUrl support for WebContentsAdapter::setContent
and add loadProgressAfterLoadHtml QML test case.
Change-Id: I2d0d7834cbbf8f508de4fa9cb72240f2ac6ebf83
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 6 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 043a7f840..1d289c781 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -386,6 +386,12 @@ QUrl QQuickWebEngineView::icon() const return d->icon; } +void QQuickWebEngineView::loadHtml(const QString &html, const QUrl &baseUrl, const QUrl &unreachableUrl) +{ + Q_D(QQuickWebEngineView); + d->adapter->setContent(html.toUtf8(), QStringLiteral("text/html;charset=UTF-8"), baseUrl, unreachableUrl); +} + void QQuickWebEngineView::goBack() { Q_D(QQuickWebEngineView); diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index abc46d55f..77d5b9828 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -96,6 +96,7 @@ public: }; public Q_SLOTS: + void loadHtml(const QString &html, const QUrl &baseUrl = QUrl(), const QUrl &unreachableUrl = QUrl()); void goBack(); void goForward(); void reload(); |