diff options
| author | Martin Negyokru <negyokru@inf.u-szeged.hu> | 2022-08-30 18:04:14 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-10-11 10:55:57 +0000 |
| commit | b5de3ad2ab1b734786951c0f3e9b9a3fe80e0991 (patch) | |
| tree | 786941aa91757bfd8ea2866eb68f2c30355e38dd | |
| parent | 7ea29d36afca64c6948e22040a5e53b7a7137dbf (diff) | |
Fix logic in bindViewAndDelegateItem
Updating adapterClient is required to Bind
correctly.
Bring back old logic from 6.3.
Fixes: QTBUG-105953
Change-Id: I8845948db379c24902df0dd2dad96982a1455531
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit e995556338da4d381c457ddd978440f5099af496)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index b566b038e..9ceffe09f 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -882,11 +882,17 @@ void QQuickWebEngineViewPrivate::bindViewAndDelegateItem(QQuickWebEngineViewPriv // Change pointers first. - if (oldViewPrivate && oldViewPrivate != viewPrivate) - oldViewPrivate->delegateItem = nullptr; + if (delegateItem && oldViewPrivate != viewPrivate) { + if (oldViewPrivate) + oldViewPrivate->delegateItem = nullptr; + delegateItem->m_adapterClient = viewPrivate; + } - if (viewPrivate && oldDelegateItem != delegateItem) + if (viewPrivate && oldDelegateItem != delegateItem) { + if (oldDelegateItem) + oldDelegateItem->m_adapterClient = nullptr; viewPrivate->delegateItem = delegateItem; + } // Then notify. |