summaryrefslogtreecommitdiffstats
path: root/src/webengine
diff options
context:
space:
mode:
Diffstat (limited to 'src/webengine')
-rw-r--r--src/webengine/api/qquickwebengineview.cpp4
-rw-r--r--src/webengine/api/qquickwebengineview_p.h2
-rw-r--r--src/webengine/doc/src/qquickwebengineview_lgpl.qdoc6
3 files changed, 4 insertions, 8 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index e124f900..fa7243b2 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -432,10 +432,10 @@ QUrl QQuickWebEngineView::icon() const
return d->icon;
}
-void QQuickWebEngineView::loadHtml(const QString &html, const QUrl &baseUrl, const QUrl &unreachableUrl)
+void QQuickWebEngineView::loadHtml(const QString &html, const QUrl &baseUrl)
{
Q_D(QQuickWebEngineView);
- d->adapter->setContent(html.toUtf8(), QStringLiteral("text/html;charset=UTF-8"), baseUrl, unreachableUrl);
+ d->adapter->setContent(html.toUtf8(), QStringLiteral("text/html;charset=UTF-8"), baseUrl);
}
void QQuickWebEngineView::goBack()
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 5c239784..92cf1f53 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -112,7 +112,7 @@ public:
};
public Q_SLOTS:
- void loadHtml(const QString &html, const QUrl &baseUrl = QUrl(), const QUrl &unreachableUrl = QUrl());
+ void loadHtml(const QString &html, const QUrl &baseUrl = QUrl());
void goBack();
void goForward();
void reload();
diff --git a/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc b/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc
index a36f318f..91aef712 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
*/