diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-08-27 20:20:34 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-08-27 22:29:28 +0000 |
| commit | 6d51697f1d4a5b1d0d57efca29a8d81a591567bd (patch) | |
| tree | b4cc5ab53bf3e8ce4c1ce02106f17df0bd8699e6 /tests/auto/other | |
| parent | 3fe645ecc9aaf4522183c39f5c9a78ebc1c90674 (diff) | |
| parent | afab1546a7665bac2a8d7a6452e6aea46bfd2127 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index 69007bd250..62c2c0a916 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -1715,7 +1715,7 @@ static QRect characterRect(const QTextEdit &edit, int offset) int h = fm.height(); qreal x = line.cursorToX(relativeOffset); - QRect r(layoutPosition.x() + x, layoutPosition.y() + line.y(), w, h); + QRect r(layoutPosition.x() + x, layoutPosition.y() + line.y() + line.ascent() + fm.descent() - h, w, h); r.moveTo(edit.viewport()->mapToGlobal(r.topLeft())); return r; |