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/core/web_contents_adapter.h | |
| 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/core/web_contents_adapter.h')
| -rw-r--r-- | src/core/web_contents_adapter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h index f39599d93..0e8eb1b21 100644 --- a/src/core/web_contents_adapter.h +++ b/src/core/web_contents_adapter.h @@ -68,7 +68,7 @@ public: void stop(); void reload(); void load(const QUrl&); - void setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl); + void setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl, const QUrl &unreachableUrl = QUrl()); QUrl activeUrl() const; QString pageTitle() const; |