summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-24 16:07:50 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-24 16:07:50 +0100
commitec7b40e87a2b129ccecf5bc46b5f84cf5563291c (patch)
treeff0d2d69c779801df482291772007a94d99fe7da /src
parent720431716a8af66d1be73a1c9462ef12af831c90 (diff)
parent6ac69be3148822a0dafce227eab19b97722b6cc2 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextedit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index ce079288..f2b72599 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -673,7 +673,7 @@ QRectF QDeclarativeTextEdit::positionToRectangle(int pos) const
Q_D(const QDeclarativeTextEdit);
QTextCursor c(d->document);
c.setPosition(pos);
- return d->control->cursorRect(c);
+ return d->control->cursorRect(c).translated(0, d->yoff);
}