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

Change-Id: I2a6eb9dd7724931bc89f28bcc156e77c4e26d069

1 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
index 0f99a414a0..990acd5301 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
@@ -298,7 +298,8 @@ bool hasValueAttribute(QAccessibleInterface *interface)
     Q_ASSERT(interface);
     const QAccessible::Role qtrole = interface->role();
     if (qtrole == QAccessible::EditableText
-            || interface->valueInterface()) {
+            || interface->valueInterface()
+            || interface->state().checkable) {
         return true;
     }
 
@@ -330,6 +331,10 @@ id getValueAttribute(QAccessibleInterface *interface)
         return QCFString::toNSString(QString::number(valueInterface->currentValue().toDouble()));
     }
 
+    if (interface->state().checkable) {
+        return [NSNumber numberWithInt: (interface->state().checked ? 1 : 0)];
+    }
+
     return nil;
 }