From 7f4872a340f7c9f181479df923ad95c7192a8982 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 17 Apr 2013 13:54:49 +0200 Subject: [PATCH] Fix crash on empty child list in QAccessibleQuickWindow::rootItem(). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I07f1482216c3147bf851046e61a56ec74f074dea Reviewed-by: Jan Arve Sæther --- .../accessible/quick/qaccessiblequickview.cpp | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/accessible/quick/qaccessiblequickview.cpp b/src/plugins/accessible/quick/qaccessiblequickview.cpp index 4251a80..b85f23c 100644 --- a/src/plugins/accessible/quick/qaccessiblequickview.cpp +++ b/src/plugins/accessible/quick/qaccessiblequickview.cpp @@ -60,8 +60,11 @@ QAccessibleQuickWindow::QAccessibleQuickWindow(QQuickWindow *object) QQuickItem *QAccessibleQuickWindow::rootItem() const { - if (window()->contentItem()) - return window()->contentItem()->childItems().first(); + if (QQuickItem *ci = window()->contentItem()) { + const QList &childItems = ci->childItems(); + if (!childItems.isEmpty()) + return childItems.first(); + } return 0; } -- 1.7.2.5