diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2021-08-25 16:42:32 +0300 |
|---|---|---|
| committer | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2021-08-31 08:58:17 +0300 |
| commit | 0464e1bacca28d7e459f105b07fbea6bb5b20930 (patch) | |
| tree | 1cfbd9126155b77d1c18171583de164f87ee9cd5 /src | |
| parent | 5c46e317510d36d3797a279d58de06e7da8833b5 (diff) | |
Avoid reparenting of InputPanel when the window is being destroyed
Fixes: QTBUG-95996
Pick-to: 5.15 6.1 6.2
Change-Id: Iac4d06cacf2e672bf4a7676f478798f27ab6f4a2
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp index e6bc3fdb..646dd6f6 100644 --- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp @@ -283,8 +283,10 @@ void QVirtualKeyboardInputContextPrivate::onInputItemChanged() For integrated keyboards, make sure it's a sibling to the overlay. The high z-order will make sure it gets events also during a modal session. */ - if (isDesktopPanel.isValid() && !isDesktopPanel.toBool()) - vkbPanel->setParentItem(quickItem->window()->contentItem()); + if (isDesktopPanel.isValid() && !isDesktopPanel.toBool()) { + if (QQuickWindow *quickWindow = quickItem->window()) + vkbPanel->setParentItem(quickWindow->contentItem()); + } } } } else { |