1 files changed, 9 insertions, 7 deletions
diff --git a/src/widgets/accessible/qaccessiblemenu.cpp b/src/widgets/accessible/qaccessiblemenu.cpp
index 7f87288520..99a9444ff1 100644
--- a/src/widgets/accessible/qaccessiblemenu.cpp
+++ b/src/widgets/accessible/qaccessiblemenu.cpp
@@ -88,8 +88,8 @@ QAccessibleInterface *QAccessibleMenu::childAt(int x, int y) const
 {
     QAction *act = menu()->actionAt(menu()->mapFromGlobal(QPoint(x,y)));
     if(act && act->isSeparator())
-        act = 0;
-    return act ? getOrCreateMenu(menu(), act) : 0;
+        act = nullptr;
+    return act ? getOrCreateMenu(menu(), act) : nullptr;
 }
 
 QString QAccessibleMenu::text(QAccessible::Text t) const
@@ -112,7 +112,7 @@ QAccessibleInterface *QAccessibleMenu::child(int index) const
 {
     if (index < childCount())
         return getOrCreateMenu(menu(), menu()->actions().at(index));
-    return 0;
+    return nullptr;
 }
 
 QAccessibleInterface *QAccessibleMenu::parent() const
@@ -165,7 +165,7 @@ QAccessibleInterface *QAccessibleMenuBar::child(int index) const
     if (index < childCount()) {
         return getOrCreateMenu(menuBar(), menuBar()->actions().at(index));
     }
-    return 0;
+    return nullptr;
 }
 
 int QAccessibleMenuBar::indexOfChild(const QAccessibleInterface *child) const
@@ -195,7 +195,7 @@ QAccessibleInterface *QAccessibleMenuItem::childAt(int x, int y ) const
             return childInterface;
         }
     }
-    return 0;
+    return nullptr;
 }
 
 int QAccessibleMenuItem::childCount() const
@@ -224,14 +224,14 @@ QAccessibleInterface *QAccessibleMenuItem::child(int index) const
 {
     if (index == 0 && action()->menu())
         return QAccessible::queryAccessibleInterface(action()->menu());
-    return 0;
+    return nullptr;
 }
 
 void *QAccessibleMenuItem::interface_cast(QAccessible::InterfaceType t)
 {
     if (t == QAccessible::ActionInterface)
         return static_cast<QAccessibleActionInterface*>(this);
-    return 0;
+    return nullptr;
 }
 
 QObject *QAccessibleMenuItem::object() const
@@ -299,6 +299,8 @@ QAccessible::State QAccessibleMenuItem::state() const
         s.disabled = true;
     if (m_action->isChecked())
         s.checked = true;
+    if (m_action->isCheckable())
+        s.checkable = true;
 
     return s;
 }