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/api/qquickwebengineview.cpp | |
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/api/qquickwebengineview.cpp')
-rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index e124f900c..fa7243b21 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() |