diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-25 01:57:49 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-25 01:57:49 (GMT) |
| commit | 35f6b95744164e635fb8a03e34b2dd6177a50ccf (patch) | |
| tree | 3e6e30b7e1ea8c072d160f0ff69df7072f3af994 /src/declarative | |
| parent | 43b1f81bc359a2c9d5c3d26f5110319803ef31c2 (diff) | |
| parent | f6d75a6023e0d10ed61a9a0d952059edc51a0a40 (diff) | |
| download | Qt-35f6b95744164e635fb8a03e34b2dd6177a50ccf.zip Qt-35f6b95744164e635fb8a03e34b2dd6177a50ccf.tar.gz Qt-35f6b95744164e635fb8a03e34b2dd6177a50ccf.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative')
| -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(); |