diff options
| author | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-01-16 18:24:17 +0100 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-01-16 18:24:17 +0100 |
| commit | 0fc1516692fb11f3489bce11a8f0cc15ad8f6b63 (patch) | |
| tree | d39aa29c33b87430598fe17751a7d65529792660 /src/webengine/api/qquickwebengineview.cpp | |
| parent | db2f69bb58ab369e44ea8bb30dcdbe90660578a2 (diff) | |
| parent | ae657b918ff22da2553dc577c877b03f49cc2bdf (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/3rdparty
Change-Id: Ied43de29444d4803218e250b096b9c72bc017af7
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 6d666feb9..1b95f86b4 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -188,7 +188,7 @@ bool QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenu // FIXME: expose the context menu data as an attached property to make this more useful if (contextMenuExtraItems) { ui()->addMenuSeparator(menu); - if (QObject* menuExtras = contextMenuExtraItems->create(ui()->creationContextForComponent(contextMenuExtraItems))) { + if (QObject* menuExtras = contextMenuExtraItems->create(qmlContext(q))) { menuExtras->setParent(menu); QQmlListReference entries(menu, defaultPropertyName(menu), qmlEngine(q)); if (entries.isValid()) |