From a7f8a81d71bf3c1bc544b4d23a5198c7a9dabeb8 Mon Sep 17 00:00:00 2001 From: Jarkko Koivikko Date: Wed, 25 Aug 2021 16:42:32 +0300 Subject: Avoid reparenting of InputPanel when the window is being destroyed Fixes: QTBUG-95996 Change-Id: Iac4d06cacf2e672bf4a7676f478798f27ab6f4a2 Reviewed-by: Jarkko Koivikko Reviewed-by: Volker Hilsheimer (cherry picked from commit 0464e1bacca28d7e459f105b07fbea6bb5b20930) Reviewed-by: Qt Cherry-pick Bot --- src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp index 4de9c778..028f3f71 100644 --- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp @@ -278,8 +278,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 { -- cgit v1.2.3 From bfad61cbbfd6453e112d1d1f78698f7477226257 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Tue, 7 Sep 2021 17:11:05 +0300 Subject: Bump version Change-Id: I93b2f743e48cd4d1292693a48e741f53fa079b96 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index d7055d75..6d03a03f 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.6 +MODULE_VERSION = 5.15.7 -- cgit v1.2.3