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

Change-Id: I04afffdce6b78856d0301eb583f21d334c7466b0

1 files changed, 3 insertions, 2 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
index 1a3c7793c0..f9a03e5b58 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
@@ -358,8 +358,9 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
         return [NSValue valueWithRange: NSMakeRange(0, 0)];
     } else if ([attribute isEqualToString:NSAccessibilityVisibleCharacterRangeAttribute]) {
         // FIXME This is not correct and may impact performance for big texts
-        return [NSValue valueWithRange: NSMakeRange(0, iface->textInterface()->characterCount())];
-
+        if (QAccessibleTextInterface *text = iface->textInterface())
+            return [NSValue valueWithRange: NSMakeRange(0, text->characterCount())];
+        return [NSValue valueWithRange: NSMakeRange(0, iface->text(QAccessible::Name).length())];
     } else if ([attribute isEqualToString:NSAccessibilityInsertionPointLineNumberAttribute]) {
         if (QAccessibleTextInterface *text = iface->textInterface()) {
             int position = text->cursorPosition();