projects
/
profile
/
ivi
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ab55e0d
)
QML Text: make sure that the bounding rect has a y position of 0.
author
Yann Bodson
<yann.bodson@nokia.com>
Sun, 12 Feb 2012 23:52:11 +0000
(09:52 +1000)
committer
Qt by Nokia
<qt-info@nokia.com>
Mon, 13 Feb 2012 01:58:23 +0000
(
02:58
+0100)
This line was lost in a previous merge.
Change-Id: If3683fa17630452abab115638c1c0ebf0824e2a1
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
src/quick/items/qquicktext.cpp
patch
|
blob
|
history
diff --git
a/src/quick/items/qquicktext.cpp
b/src/quick/items/qquicktext.cpp
index
52365a8
..
f96c9b1
100644
(file)
--- a/
src/quick/items/qquicktext.cpp
+++ b/
src/quick/items/qquicktext.cpp
@@
-773,6
+773,7
@@
QRect QQuickTextPrivate::setupTextLayout()
}
layout.endLayout();
+ br.moveTop(0);
if (once) {
naturalWidth = layout.maximumWidth();