From c4fc323d0771e24ae726065cdce9eafef2c09c41 Mon Sep 17 00:00:00 2001 From: Michael Bruning Date: Thu, 9 Jun 2016 12:58:29 +0200 Subject: Also initialize context data if the menu policy is CustomContextMenu. It does contain valid data and some users seem to build upon the standard context menu. Also, return early with a nullptr from createStandardContextMenu when the context menu data d ptr is null. Task-number: QTBUG-53952 Change-Id: Ib30e85f10e3ae681527210a9e8554f5a21dba7ae Reviewed-by: Leena Miettinen --- src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc') diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 90d5111c1..539e809d4 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -281,6 +281,9 @@ the user clicks on the web page with the right mouse button. It is called from the default \l{QWidget::}{contextMenuEvent()} handler. The popup menu's ownership is transferred to the caller. + + Returns \c nullptr if the context menu data is not initialized, for example when it + is called when there is actually no context menu requested. */ /*! -- cgit v1.2.3