From cb9672c86d2679bcb0d9e10f76b12eb03f4c515e Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@digia.com>
Date: Tue, 27 Aug 2013 13:36:36 +0200
Subject: [PATCH] Don't crash due to KeyRelease on an unloaded Item
Task-number: QTBUG-33127
Change-Id: Ie0c28abdb32c3b2318f934d3d2ddf459329384a2
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
---
src/quick/items/qquickitem.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 547b795cd8..a5f8996bf5 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -4396,12 +4396,12 @@ void QQuickItemPrivate::deliverKeyEvent(QKeyEvent *e)
extra->keyHandler->keyReleased(e, true);
}
- if (e->isAccepted())
+ if (e->isAccepted() || !q->window())
return;
//only care about KeyPress now
- if ((q == q->window()->contentItem() || q->activeFocusOnTab())
- && e->type() == QEvent::KeyPress) {
+ if (e->type() == QEvent::KeyPress &&
+ (q == q->window()->contentItem() || q->activeFocusOnTab())) {
bool res = false;
if (!(e->modifiers() & (Qt::ControlModifier | Qt::AltModifier))) { //### Add MetaModifier?
if (e->key() == Qt::Key_Backtab
--
GitLab