summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-11-04 13:06:17 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-11-04 13:06:17 +0000
commite304dfb2d3c4ce9b223954ad357aa1e1c919afb3 (patch)
tree09cde4464c7d508623cf1d6d2e30e62b335981e3 /src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
parent96c9817575516f8c3c676830997b9a86adf766e2 (diff)
parentf8246099eafbfa08910544a89c7a5047af92f54d (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm')
-rw-r--r--src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
index 28f3b2af84..b55393c7dc 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
@@ -56,6 +56,14 @@ static void convertLineOffset(QAccessibleTextInterface *text, int &line, int &of
do {
curStart = curEnd;
text->textAtOffset(curStart, QAccessible::LineBoundary, &curStart, &curEnd);
+ // If the text is empty then we just return
+ if (curStart == -1 || curEnd == -1) {
+ if (start)
+ *start = 0;
+ if (end)
+ *end = 0;
+ return;
+ }
++curLine;
{
// check for a case where a single word longer than the text edit's width and gets wrapped