diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-18 15:40:56 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-01-19 23:13:47 +0100 |
| commit | a7510e85e6f53f4e889307edb58f26c8900d2d06 (patch) | |
| tree | d4b6208bb8bf7d8288c57d7024c2813b3af1b5aa /src/webengine/api | |
| parent | 91696b2cb090e5b6147a30465f74d8d37db48615 (diff) | |
| parent | f1f763cf3c7254406b7b6f01551b6624210bb834 (diff) | |
| download | qtwebengine-a7510e85e6f53f4e889307edb58f26c8900d2d06.tar.gz | |
Merge branch '5.15' into dev
Last commits before 87 update.
Change-Id: Id156b0199a8fd354c946cfe604ae8541ba554658
Diffstat (limited to 'src/webengine/api')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 561c6f85d..fb935d2ec 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -236,9 +236,6 @@ void QQuickWebEngineViewPrivate::contextMenuRequested(QWebEngineContextMenuReque m_contextMenuRequest = request; - // FIXME: we most liekly do not need to make any copy here - auto *r = new QWebEngineContextMenuRequest( - new QWebEngineContextMenuRequestPrivate(*request->d.data())); QQmlEngine *engine = qmlEngine(q); // TODO: this is a workaround for QTBUG-65044 @@ -246,6 +243,9 @@ void QQuickWebEngineViewPrivate::contextMenuRequested(QWebEngineContextMenuReque return; // mark the object for gc by creating temporary jsvalue + // FIXME: we most likely do not need to make any copy here + auto *r = new QWebEngineContextMenuRequest( + new QWebEngineContextMenuRequestPrivate(*request->d.data())); engine->newQObject(r); Q_EMIT q->contextMenuRequested(r); |