summaryrefslogtreecommitdiffstats
path: root/src/webengine/api/qquickwebengineview_p.h
diff options
context:
space:
mode:
authorSzabolcs David <davidsz@inf.u-szeged.hu>2014-05-06 02:04:08 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-08 15:31:02 +0200
commit9648528ad6fbd66eeaae3189173a7d7b47b935ce (patch)
tree8d420f17d0be7077517e5e257adfe98773ab41f3 /src/webengine/api/qquickwebengineview_p.h
parent388a71d66f31df999dc9259d4eb156c497ad5247 (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_p.h')
-rw-r--r--src/webengine/api/qquickwebengineview_p.h2
1 files changed, 1 insertions, 1 deletions
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();