1 files changed, 12 insertions, 44 deletions

diff --git a/src/quick/accessible/qaccessiblequickview.cpp b/src/quick/accessible/qaccessiblequickview.cpp
index b0d2c485f1..08f5889070 100644
--- a/src/quick/accessible/qaccessiblequickview.cpp
+++ b/src/quick/accessible/qaccessiblequickview.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQuick module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qaccessiblequickview_p.h"
 
@@ -57,14 +21,14 @@ QAccessibleQuickWindow::QAccessibleQuickWindow(QQuickWindow *object)
 
 QList<QQuickItem *> QAccessibleQuickWindow::rootItems() const
 {
-    if (QQuickItem *ci = window()->contentItem())
+    if (QQuickItem *ci = window() ? window()->contentItem() : nullptr)
         return accessibleUnignoredChildren(ci);
     return QList<QQuickItem *>();
 }
 
 int QAccessibleQuickWindow::childCount() const
 {
-    return rootItems().count();
+    return rootItems().size();
 }
 
 QAccessibleInterface *QAccessibleQuickWindow::parent() const
@@ -76,14 +40,14 @@ QAccessibleInterface *QAccessibleQuickWindow::parent() const
 QAccessibleInterface *QAccessibleQuickWindow::child(int index) const
 {
     const QList<QQuickItem*> &kids = rootItems();
-    if (index >= 0 && index < kids.count())
+    if (index >= 0 && index < kids.size())
         return QAccessible::queryAccessibleInterface(kids.at(index));
     return nullptr;
 }
 
 QAccessibleInterface *QAccessibleQuickWindow::focusChild() const
 {
-    QObject *focusObject = window()->focusObject();
+    QObject *focusObject = window() ? window()->focusObject() : nullptr;
     if (focusObject) {
         QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(focusObject);
         if (!iface || iface == this || !iface->focusChild())
@@ -103,18 +67,22 @@ QAccessible::State QAccessibleQuickWindow::state() const
     QAccessible::State st;
     if (window() == QGuiApplication::focusWindow())
         st.active = true;
-    if (!window()->isVisible())
+    if (!window() || !window()->isVisible())
         st.invisible = true;
     return st;
 }
 
 QRect QAccessibleQuickWindow::rect() const
 {
+    if (!window())
+        return {};
     return QRect(window()->x(), window()->y(), window()->width(), window()->height());
 }
 
 QString QAccessibleQuickWindow::text(QAccessible::Text text) const
 {
+    if (!window())
+        return {};
 #ifdef Q_ACCESSIBLE_QUICK_ITEM_ENABLE_DEBUG_DESCRIPTION
     if (text == QAccessible::DebugDescription) {
         return QString::fromLatin1(object()->metaObject()->className()) ;
@@ -145,7 +113,7 @@ int QAccessibleQuickWindow::indexOfChild(const QAccessibleInterface *iface) cons
     int i = -1;
     if (iface) {
         const QList<QQuickItem *> &roots = rootItems();
-        i = roots.count() - 1;
+        i = roots.size() - 1;
         while (i >= 0) {
             if (iface->object() == roots.at(i))
                 break;