diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 13:03:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 13:03:23 (GMT) |
| commit | 265074001db00920abbb0defba69743ef71c4cc0 (patch) | |
| tree | ffb246ba3fdb8c987e602d030a3bf066b8d8d91d /src | |
| parent | bf95c0ed87bf8a2ccd0a3d57ed81b8ae8fb8c4f2 (diff) | |
| parent | b888c9cca5ba2994344533c7602d22e1bc8e5db3 (diff) | |
| download | Qt-265074001db00920abbb0defba69743ef71c4cc0.zip Qt-265074001db00920abbb0defba69743ef71c4cc0.tar.gz Qt-265074001db00920abbb0defba69743ef71c4cc0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Text bounding rect calculated incorrectly if non-top aligned.
Diffstat (limited to 'src')
| -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 fdc1a71..720692c 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -1416,10 +1416,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; } |