diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-08-06 09:19:36 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-08-12 15:58:09 +0200 |
| commit | 62eeabdcf58f3eb1c00ff2efd5bc05453dfb2bf8 (patch) | |
| tree | 7fd7181d48222e33e75232b9fefafa779c45ee70 /src/core | |
| parent | 0dca1220141c1aa0ce983e27f1f09425f47f062d (diff) | |
Fix api unfilteredLinkUrl -> linkUrl
Before previous change unfilteredLink(private) was returned as
linkUrl(public), however linkUrl(private) was also used,
therefore when merging context menu data classes functions
were refactored to unfilteredLink and filteredLink to prevent
braking the logic, now fix the public api as it was before.
Change-Id: I84e0444b32aa344ed0401b58b5a8144a6fb58441
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/api/qwebenginecontextmenurequest.cpp | 2 | ||||
| -rw-r--r-- | src/core/api/qwebenginecontextmenurequest.h | 4 | ||||
| -rw-r--r-- | src/core/render_view_context_menu_qt.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/api/qwebenginecontextmenurequest.cpp b/src/core/api/qwebenginecontextmenurequest.cpp index 88b775edd..62a328b72 100644 --- a/src/core/api/qwebenginecontextmenurequest.cpp +++ b/src/core/api/qwebenginecontextmenurequest.cpp @@ -151,7 +151,7 @@ QString QWebEngineContextMenuRequest::linkText() const Returns the URL of a link if the menu context request is a link. It is not guaranteed to be a valid URL. */ -QUrl QWebEngineContextMenuRequest::unfilteredLinkUrl() const +QUrl QWebEngineContextMenuRequest::linkUrl() const { return d->m_unfilteredLinkUrl; } diff --git a/src/core/api/qwebenginecontextmenurequest.h b/src/core/api/qwebenginecontextmenurequest.h index ef510b394..bc8095dc9 100644 --- a/src/core/api/qwebenginecontextmenurequest.h +++ b/src/core/api/qwebenginecontextmenurequest.h @@ -117,7 +117,7 @@ public: Q_PROPERTY(QPoint position READ position CONSTANT FINAL) Q_PROPERTY(QString selectedText READ selectedText CONSTANT FINAL) Q_PROPERTY(QString linkText READ linkText CONSTANT FINAL) - Q_PROPERTY(QUrl linkUrl READ unfilteredLinkUrl CONSTANT FINAL) + Q_PROPERTY(QUrl linkUrl READ linkUrl CONSTANT FINAL) Q_PROPERTY(QUrl mediaUrl READ mediaUrl CONSTANT FINAL) Q_PROPERTY(MediaType mediaType READ mediaType CONSTANT FINAL) Q_PROPERTY(bool isContentEditable READ isContentEditable CONSTANT FINAL) @@ -131,7 +131,7 @@ public: QPoint position() const; QString selectedText() const; QString linkText() const; - QUrl unfilteredLinkUrl() const; + QUrl linkUrl() const; QUrl mediaUrl() const; MediaType mediaType() const; bool isContentEditable() const; diff --git a/src/core/render_view_context_menu_qt.cpp b/src/core/render_view_context_menu_qt.cpp index e5747f382..47c8a6e32 100644 --- a/src/core/render_view_context_menu_qt.cpp +++ b/src/core/render_view_context_menu_qt.cpp @@ -106,7 +106,7 @@ namespace QtWebEngineCore { } if (m_contextData->filteredLinkUrl().isValid() - || !m_contextData->unfilteredLinkUrl().isEmpty() + || !m_contextData->linkUrl().isEmpty() || !m_contextData->filteredLinkUrl().isEmpty()) appendLinkItems(); |