From 3f73e47130f3912f99376314a06a2033225b0dda Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 13 Jun 2016 13:29:51 +0200 Subject: Add context menu request to qml api Introduce qml APIs to support custom context menus. [ChangeLog][QtWebEngine][QML] Added ability to show custom context menu. Task-number: QTBUG-52554 Change-Id: Ief0cbbbf221f4c6849e16bbba7417dccee59ad61 Reviewed-by: Kai Koehne --- src/webenginewidgets/api/qwebenginecontextmenudata.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/webenginewidgets/api/qwebenginecontextmenudata.cpp') diff --git a/src/webenginewidgets/api/qwebenginecontextmenudata.cpp b/src/webenginewidgets/api/qwebenginecontextmenudata.cpp index 808c6f8b0..23be32bf6 100644 --- a/src/webenginewidgets/api/qwebenginecontextmenudata.cpp +++ b/src/webenginewidgets/api/qwebenginecontextmenudata.cpp @@ -135,7 +135,7 @@ void QWebEngineContextMenuData::reset() */ QPoint QWebEngineContextMenuData::position() const { - return d ? d->pos : QPoint(); + return d ? d->position() : QPoint(); } /*! @@ -143,7 +143,7 @@ QPoint QWebEngineContextMenuData::position() const */ QString QWebEngineContextMenuData::linkText() const { - return d ? d->linkText : QString(); + return d ? d->linkText() : QString(); } /*! @@ -151,7 +151,7 @@ QString QWebEngineContextMenuData::linkText() const */ QUrl QWebEngineContextMenuData::linkUrl() const { - return d ? d->linkUrl : QUrl(); + return d ? d->linkUrl() : QUrl(); } /*! @@ -159,7 +159,7 @@ QUrl QWebEngineContextMenuData::linkUrl() const */ QString QWebEngineContextMenuData::selectedText() const { - return d ? d->selectedText : QString(); + return d ? d->selectedText() : QString(); } /*! @@ -167,7 +167,7 @@ QString QWebEngineContextMenuData::selectedText() const */ QUrl QWebEngineContextMenuData::mediaUrl() const { - return d ? d->mediaUrl : QUrl(); + return d ? d->mediaUrl() : QUrl(); } /*! @@ -175,7 +175,7 @@ QUrl QWebEngineContextMenuData::mediaUrl() const */ QWebEngineContextMenuData::MediaType QWebEngineContextMenuData::mediaType() const { - return d ? static_cast(d->mediaType) : MediaTypeNone; + return d ? static_cast(d->mediaType()) : MediaTypeNone; } /*! @@ -183,7 +183,7 @@ QWebEngineContextMenuData::MediaType QWebEngineContextMenuData::mediaType() cons */ bool QWebEngineContextMenuData::isContentEditable() const { - return d ? d->isEditable : false; + return d ? d->isEditable() : false; } /*! @@ -194,7 +194,7 @@ bool QWebEngineContextMenuData::isContentEditable() const QString QWebEngineContextMenuData::misspelledWord() const { if (d) - return d->misspelledWord; + return d->misspelledWord(); return QString(); } @@ -206,7 +206,7 @@ QString QWebEngineContextMenuData::misspelledWord() const QStringList QWebEngineContextMenuData::spellCheckerSuggestions() const { if (d) - return d->spellCheckerSuggestions; + return d->spellCheckerSuggestions(); return QStringList(); } -- cgit v1.2.1