1 files changed, 20 insertions, 8 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
index a1176da33f..f9a03e5b58 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
@@ -51,6 +51,19 @@ QT_USE_NAMESPACE
 
 #ifndef QT_NO_ACCESSIBILITY
 
+/**
+ * Converts between absolute character offsets and line numbers of a
+ * QAccessibleTextInterface. Works in exactly one of two modes:
+ *
+ *  - Pass *line == -1 in order to get a line containing character at the given
+ *    *offset
+ *  - Pass *offset == -1 in order to get the offset of first character of the
+ *    given *line
+ *
+ * You can optionally also pass non-NULL `start` and `end`, which will in both
+ * modes be filled with the offset of the first and last characters of the
+ * relevant line.
+ */
 static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *offset, NSUInteger *start = 0, NSUInteger *end = 0)
 {
     Q_ASSERT(*line == -1 || *offset == -1);
@@ -350,12 +363,8 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
         return [NSValue valueWithRange: NSMakeRange(0, iface->text(QAccessible::Name).length())];
     } else if ([attribute isEqualToString:NSAccessibilityInsertionPointLineNumberAttribute]) {
         if (QAccessibleTextInterface *text = iface->textInterface()) {
-            int line = 0; // true for all single line edits
-            if (iface->state().multiLine) {
-                int position = text->cursorPosition();
-                convertLineOffset(text, &line, &position);
-            }
-            return @(line);
+            int position = text->cursorPosition();
+            return [self accessibilityAttributeValue:NSAccessibilityLineForIndexParameterizedAttribute forParameter:@(position)];
         }
         return nil;
     } else if ([attribute isEqualToString:NSAccessibilityMinValueAttribute]) {
@@ -411,8 +420,11 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
         int index = [parameter intValue];
         if (index < 0 || index > iface->textInterface()->characterCount())
             return nil;
-        int line = -1;
-        convertLineOffset(iface->textInterface(), &line, &index);
+        int line = 0; // true for all single line edits
+        if (iface->state().multiLine) {
+            line = -1;
+            convertLineOffset(iface->textInterface(), &line, &index);
+        }
         return @(line);
     }
     if ([attribute isEqualToString: NSAccessibilityRangeForLineParameterizedAttribute]) {