diff options
| author | Balazs Egedi <egedib@inf.u-szeged.hu> | 2021-12-14 15:45:24 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-23 16:07:48 +0000 |
| commit | 5d1c2d65b61f8b94ecd1a0629529ea4098d89a55 (patch) | |
| tree | 36ead5d973235ff355a94a73aceb80a550f9af6c /src | |
| parent | bc9677e43afd9a566cce08420c86ac322fb81259 (diff) | |
FIXUP: Add onTouchSelectionMenuRequested QML handler
Fixed CodeChecker warnings, added missing documentation.
Change-Id: I723ea2b0952ded52f513a3cd53ac443b727f1e58
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 56005ae3d52568b469db32498afebd9c52e4881b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
4 files changed, 22 insertions, 4 deletions
diff --git a/src/core/touch_selection_menu_controller.h b/src/core/touch_selection_menu_controller.h index a90695c80..1167d8bc9 100644 --- a/src/core/touch_selection_menu_controller.h +++ b/src/core/touch_selection_menu_controller.h @@ -55,7 +55,7 @@ public: Copy = 0x2, Paste = 0x4 }; - Q_DECLARE_FLAGS(TouchSelectionCommandFlags, TouchSelectionCommandFlag); + Q_DECLARE_FLAGS(TouchSelectionCommandFlags, TouchSelectionCommandFlag) Q_FLAG(TouchSelectionCommandFlag) TouchSelectionMenuController(TouchSelectionControllerClientQt *touchSelectionControllerClient); diff --git a/src/webenginequick/api/qquickwebenginetouchselectionmenurequest.cpp b/src/webenginequick/api/qquickwebenginetouchselectionmenurequest.cpp index f406587d3..0ba2a496a 100644 --- a/src/webenginequick/api/qquickwebenginetouchselectionmenurequest.cpp +++ b/src/webenginequick/api/qquickwebenginetouchselectionmenurequest.cpp @@ -90,7 +90,9 @@ QQuickWebEngineTouchSelectionMenuRequestPrivate::QQuickWebEngineTouchSelectionMe /*! Destroys the touch selection menu request. */ -QQuickWebEngineTouchSelectionMenuRequest::~QQuickWebEngineTouchSelectionMenuRequest() = default; +QQuickWebEngineTouchSelectionMenuRequest::~QQuickWebEngineTouchSelectionMenuRequest() +{ +} /*! Returns the number of buttons that must be displayed, based on the available actions. diff --git a/src/webenginequick/api/qquickwebenginetouchselectionmenurequest_p.h b/src/webenginequick/api/qquickwebenginetouchselectionmenurequest_p.h index c6a8fc8c6..b7ea4f06b 100644 --- a/src/webenginequick/api/qquickwebenginetouchselectionmenurequest_p.h +++ b/src/webenginequick/api/qquickwebenginetouchselectionmenurequest_p.h @@ -79,13 +79,13 @@ public: Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted FINAL) Q_PROPERTY(QRect selectionBounds READ selectionBounds CONSTANT FINAL REVISION(1)) Q_PROPERTY(TouchSelectionCommandFlags touchSelectionCommandFlags READ touchSelectionCommandFlags CONSTANT FINAL REVISION(1)) - QML_NAMED_ELEMENT(QQuickWebEngineTouchSelectionMenuRequest) + QML_NAMED_ELEMENT(TouchSelectionMenuRequest) QML_ADDED_IN_VERSION(6, 3) QML_UNCREATABLE("") QQuickWebEngineTouchSelectionMenuRequest(QRect bounds, QtWebEngineCore::TouchSelectionMenuController *touchSelectionMenuController); - virtual ~QQuickWebEngineTouchSelectionMenuRequest(); + ~QQuickWebEngineTouchSelectionMenuRequest(); int buttonCount(); bool isAccepted() const; diff --git a/src/webenginequick/doc/src/webengineview_lgpl.qdoc b/src/webenginequick/doc/src/webengineview_lgpl.qdoc index f0f6fc8fe..7063a92ff 100644 --- a/src/webenginequick/doc/src/webengineview_lgpl.qdoc +++ b/src/webenginequick/doc/src/webengineview_lgpl.qdoc @@ -1473,3 +1473,19 @@ \sa renderProcessPid */ + +/*! + \qmlsignal WebEngineView::touchSelectionMenuRequested(TouchSelectionMenuRequest *request) + \since QtWebEngine 6.3 + \readonly + + This signal is emitted when a touch selection menu is requested at a specified position. + + The \a request can be handled by using the methods of the TouchSelectionMenuRequest + type. + + \note Signal handlers need to call \c{request.accepted = true} to prevent a default touch + selection menu from showing up. + + \sa TouchSelectionMenuRequest +*/ |