From 0498dc995ddac96009c5ef496545cdd6f49f367f Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Tue, 6 Aug 2013 19:58:29 +0200
Subject: [PATCH] Implement QWebEngineView/Page::url/setUrl.
Change-Id: I8b188fb1c6167612307d4db3272f5ae6f85705c7
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
lib/widgets/Api/qwebenginepage.cpp | 11 +++++++++++
lib/widgets/Api/qwebengineview.cpp | 10 ++++++++++
2 files changed, 21 insertions(+)
diff --git a/lib/widgets/Api/qwebenginepage.cpp b/lib/widgets/Api/qwebenginepage.cpp
index ed54226ff..d2dee546f 100644
--- a/lib/widgets/Api/qwebenginepage.cpp
+++ b/lib/widgets/Api/qwebenginepage.cpp
@@ -172,4 +172,15 @@ QString QWebEnginePage::title() const
return d->adapter->pageTitle();
}
+void QWebEnginePage::setUrl(const QUrl &url)
+{
+ load(url);
+}
+
+QUrl QWebEnginePage::url() const
+{
+ Q_D(const QWebEnginePage);
+ return d->adapter->activeUrl();
+}
+
#include "moc_qwebenginepage.cpp"
diff --git a/lib/widgets/Api/qwebengineview.cpp b/lib/widgets/Api/qwebengineview.cpp
index 98829b091..7e8ee3526 100644
--- a/lib/widgets/Api/qwebengineview.cpp
+++ b/lib/widgets/Api/qwebengineview.cpp
@@ -119,6 +119,16 @@ QString QWebEngineView::title() const
return page()->title();
}
+void QWebEngineView::setUrl(const QUrl &url)
+{
+ page()->setUrl(url);
+}
+
+QUrl QWebEngineView::url() const
+{
+ return page()->url();
+}
+
void QWebEngineView::stop()
{
page()->triggerAction(QWebEnginePage::Stop);
--
GitLab