diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-25 05:51:22 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-25 05:51:22 (GMT) |
| commit | b915bc2d710e365e7c9083ba65d08de08ea02f74 (patch) | |
| tree | 8e87760b9154493372f1f8b499b52e661547e3ca /src/declarative/graphicsitems | |
| parent | 950f3849e3bd2edd6bcc2784dbeadcb604c38e2d (diff) | |
| parent | d022acd47350f61d3959b076d7bc92df86015b16 (diff) | |
| download | Qt-b915bc2d710e365e7c9083ba65d08de08ea02f74.zip Qt-b915bc2d710e365e7c9083ba65d08de08ea02f74.tar.gz Qt-b915bc2d710e365e7c9083ba65d08de08ea02f74.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
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 307b674..ca253df 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -811,8 +811,8 @@ void QDeclarativeText::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWid break; } - bool needClip = !clip() && (d->imgCache.width() > width() || - d->imgCache.height() > height()); + bool needClip = clip() && (d->imgCache.width() > width() || + d->imgCache.height() > height()); if (needClip) { p->save(); |