Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Ia24cc8b86def0d9d9c17d6775cc519e491b860b1

1 files changed, 4 insertions, 4 deletions

diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index a55bf1106a..64083d09b9 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -362,7 +362,7 @@ QAccessibleInterface *QAccessibleWidget::child(int index) const
     QWidgetList childList = childWidgets(widget());
     if (index >= 0 && index < childList.size())
         return QAccessible::queryAccessibleInterface(childList.at(index));
-    return 0;
+    return nullptr;
 }
 
 /*! \reimp */
@@ -373,11 +373,11 @@ QAccessibleInterface *QAccessibleWidget::focusChild() const
 
     QWidget *fw = widget()->focusWidget();
     if (!fw)
-        return 0;
+        return nullptr;
 
     if (isAncestor(widget(), fw) || fw == widget())
         return QAccessible::queryAccessibleInterface(fw);
-    return 0;
+    return nullptr;
 }
 
 /*! \reimp */
@@ -521,7 +521,7 @@ void *QAccessibleWidget::interface_cast(QAccessible::InterfaceType t)
 {
     if (t == QAccessible::ActionInterface)
        return static_cast<QAccessibleActionInterface*>(this);
-    return 0;
+    return nullptr;
 }
 
 QT_END_NAMESPACE