diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-31 11:26:52 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-09 11:22:49 +0000 |
| commit | 56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 (patch) | |
| tree | 6202161544b2b7875d9a9aef1c8767eac47b2e2f /src/webenginewidgets | |
| parent | 8b587a85efaf73082dd6522f757ea7c6d1b33aae (diff) | |
QML API for context menu data
Adds QML API for the context menu data and improved spell checking API.
Change-Id: I47868bdfaaec42d13aa7693bdc14bc75b008b862
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginecontextmenudata.cpp | 3 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginecontextmenudata.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/webenginewidgets/api/qwebenginecontextmenudata.cpp b/src/webenginewidgets/api/qwebenginecontextmenudata.cpp index 1c5b53701..ae24016f6 100644 --- a/src/webenginewidgets/api/qwebenginecontextmenudata.cpp +++ b/src/webenginewidgets/api/qwebenginecontextmenudata.cpp @@ -120,6 +120,7 @@ bool QWebEngineContextMenuData::isValid() const /*! Resets the context data, making it invalid. + \internal \sa isValid() */ @@ -132,7 +133,7 @@ void QWebEngineContextMenuData::reset() /*! Returns the position of the context, usually the mouse position where the context menu event was triggered. */ -QPoint QWebEngineContextMenuData::pos() const +QPoint QWebEngineContextMenuData::position() const { return d ? d->pos : QPoint(); } diff --git a/src/webenginewidgets/api/qwebenginecontextmenudata.h b/src/webenginewidgets/api/qwebenginecontextmenudata.h index 751ad9753..44f1def94 100644 --- a/src/webenginewidgets/api/qwebenginecontextmenudata.h +++ b/src/webenginewidgets/api/qwebenginecontextmenudata.h @@ -68,9 +68,8 @@ public: MediaTypePlugin }; bool isValid() const; - void reset(); - QPoint pos() const; + QPoint position() const; QString selectedText() const; QString linkText() const; QUrl linkUrl() const; @@ -84,6 +83,7 @@ public: #endif private: + void reset(); typedef QtWebEngineCore::WebEngineContextMenuData QWebEngineContextDataPrivate; QWebEngineContextMenuData &operator=(const QWebEngineContextDataPrivate &priv); const QWebEngineContextDataPrivate *d; |