diff options
Diffstat (limited to 'src')
| -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 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 6 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 6 |
5 files changed, 10 insertions, 10 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(); diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index ecbde46e6..0861d0ca9 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1841,9 +1841,9 @@ void QQuickWebEngineView::triggerWebAction(WebAction action) } break; case CopyLinkToClipboard: - if (!d->m_contextMenuRequest->unfilteredLinkUrl().isEmpty()) { + if (!d->m_contextMenuRequest->linkUrl().isEmpty()) { QString urlString = - d->m_contextMenuRequest->unfilteredLinkUrl().toString(QUrl::FullyEncoded); + d->m_contextMenuRequest->linkUrl().toString(QUrl::FullyEncoded); QString linkText = d->m_contextMenuRequest->linkText().toHtmlEscaped(); QString title = d->m_contextMenuRequest->titleText(); if (!title.isEmpty()) @@ -1853,7 +1853,7 @@ void QQuickWebEngineView::triggerWebAction(WebAction action) QString html = QStringLiteral("<a href=\"") + urlString + QStringLiteral("\"") + title + QStringLiteral(">") + linkText + QStringLiteral("</a>"); data->setHtml(html); - data->setUrls(QList<QUrl>() << d->m_contextMenuRequest->unfilteredLinkUrl()); + data->setUrls(QList<QUrl>() << d->m_contextMenuRequest->linkUrl()); qApp->clipboard()->setMimeData(data); } break; diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 28377be0c..f5bec06fb 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1426,8 +1426,8 @@ void QWebEnginePage::triggerAction(WebAction action, bool) } break; case CopyLinkToClipboard: - if (d->view && !d->view->lastContextMenuRequest()->unfilteredLinkUrl().isEmpty()) { - QString urlString = d->view->lastContextMenuRequest()->unfilteredLinkUrl().toString( + if (d->view && !d->view->lastContextMenuRequest()->linkUrl().isEmpty()) { + QString urlString = d->view->lastContextMenuRequest()->linkUrl().toString( QUrl::FullyEncoded); QString linkText = d->view->lastContextMenuRequest()->linkText().toHtmlEscaped(); QString title = d->view->lastContextMenuRequest()->titleText(); @@ -1438,7 +1438,7 @@ void QWebEnginePage::triggerAction(WebAction action, bool) QString html = QStringLiteral("<a href=\"") + urlString + QStringLiteral("\"") + title + QStringLiteral(">") + linkText + QStringLiteral("</a>"); data->setHtml(html); - data->setUrls(QList<QUrl>() << d->view->lastContextMenuRequest()->unfilteredLinkUrl()); + data->setUrls(QList<QUrl>() << d->view->lastContextMenuRequest()->linkUrl()); qApp->clipboard()->setMimeData(data); } break; |