diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-22 17:15:21 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-22 17:15:21 (GMT) |
| commit | a5c3c11e3e2204da6c8be9af98b38929366fafb8 (patch) | |
| tree | e4aa81a4cd1783875b3f77fb75afb6c151801365 /src/declarative/graphicsitems | |
| parent | b268977478477952a5067ca6389b73d00d1807d2 (diff) | |
| parent | 265074001db00920abbb0defba69743ef71c4cc0 (diff) | |
| download | Qt-a5c3c11e3e2204da6c8be9af98b38929366fafb8.zip Qt-a5c3c11e3e2204da6c8be9af98b38929366fafb8.tar.gz Qt-a5c3c11e3e2204da6c8be9af98b38929366fafb8.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Diffstat (limited to 'src/declarative/graphicsitems')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index 994c01e..3ab6417 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -1393,10 +1393,10 @@ QRectF QDeclarativeText::boundingRect() const case AlignTop: break; case AlignBottom: - rect.setY(h - rect.height()); + rect.moveTop(h - rect.height()); break; case AlignVCenter: - rect.setY((h - rect.height()) / 2); + rect.moveTop((h - rect.height()) / 2); break; } |