diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2014-10-22 12:34:17 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2014-10-28 15:45:01 +0100 |
| commit | 2282c6605bc554ca610239f3dbc4d6d067c25763 (patch) | |
| tree | 224ae4fd2b99f93f47e533baf8be64c3c959831a /src/webenginewidgets | |
| parent | 7356189d9680f1697f219173b771298238567d15 (diff) | |
Make url handling consistent in widget and quick API
Use explicit url in quick API too and use GetLastCommittedURL instead of
GetVisibleURL for getting the expected urls in tests.
Change-Id: If3251323645979643f3dc0e16491fe35b584f51c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 8 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage_p.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 8c3c2bb45..d6782974b 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -196,7 +196,7 @@ void QWebEnginePagePrivate::titleChanged(const QString &title) void QWebEnginePagePrivate::urlChanged(const QUrl &url) { Q_Q(QWebEnginePage); - m_explicitUrl = QUrl(); + explicitUrl = QUrl(); Q_EMIT q->urlChanged(url); } @@ -256,7 +256,7 @@ void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, int erro Q_UNUSED(errorDescription); isLoading = false; if (success) - m_explicitUrl = QUrl(); + explicitUrl = QUrl(); Q_EMIT q->loadFinished(success); updateNavigationActions(); } @@ -825,14 +825,14 @@ QString QWebEnginePage::title() const void QWebEnginePage::setUrl(const QUrl &url) { Q_D(QWebEnginePage); - d->m_explicitUrl = url; + d->explicitUrl = url; load(url); } QUrl QWebEnginePage::url() const { Q_D(const QWebEnginePage); - return d->m_explicitUrl.isValid() ? d->m_explicitUrl : d->adapter->activeUrl(); + return d->explicitUrl.isValid() ? d->explicitUrl : d->adapter->activeUrl(); } QUrl QWebEnginePage::requestedUrl() const diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h index ccbfb2bc1..54129229f 100644 --- a/src/webenginewidgets/api/qwebenginepage_p.h +++ b/src/webenginewidgets/api/qwebenginepage_p.h @@ -151,7 +151,7 @@ public: QWebEngineSettings *settings; QWebEngineView *view; QSize viewportSize; - QUrl m_explicitUrl; + QUrl explicitUrl; WebEngineContextMenuData m_menuData; bool isLoading; |