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/webengine/doc | |
| 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/webengine/doc')
| -rw-r--r-- | src/webengine/doc/src/qquickwebengineview_lgpl.qdoc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc b/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc index a36f318f8..91aef7122 100644 --- a/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc +++ b/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc @@ -179,7 +179,7 @@ */ /*! - \qmlmethod void WebEngineView::loadHtml(string html, url baseUrl, url unreachableUrl) + \qmlmethod void WebEngineView::loadHtml(string html, url baseUrl) \brief Loads the specified \a html as the content of the web view. (This method offers a lower-level alternative to the \c{url} property, @@ -191,10 +191,6 @@ and that was the base url, then an image referenced with the relative url \c diagram.png would be looked for at \c{http://www.example.com/documents/diagram.png}. - If an \a unreachableUrl is passed it is used as the url for the loaded - content. This is typically used to display error pages for a failed - load. - \sa WebEngineView::url */ |