diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-04-29 04:33:52 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-04-29 04:33:52 (GMT) |
| commit | e79ce618a079c7f1664959da5d9d13b5f4e1d370 (patch) | |
| tree | dabf9efe361c27cec4377de04e1a24ae3eca03fb /src/declarative/fx/qfxtextedit.cpp | |
| parent | f49f040660fd004ea6289cdc3a92a7ad42338237 (diff) | |
| parent | 9ba03ca32ae12f8b135f3b4f80c445edc3e6b55e (diff) | |
| download | Qt-e79ce618a079c7f1664959da5d9d13b5f4e1d370.zip Qt-e79ce618a079c7f1664959da5d9d13b5f4e1d370.tar.gz Qt-e79ce618a079c7f1664959da5d9d13b5f4e1d370.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxtextedit.cpp')
| -rw-r--r-- | src/declarative/fx/qfxtextedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp index 7efb826..68aea01 100644 --- a/src/declarative/fx/qfxtextedit.cpp +++ b/src/declarative/fx/qfxtextedit.cpp @@ -270,7 +270,7 @@ QColor QFxTextEdit::color() const void QFxTextEdit::setColor(const QColor &color) { Q_D(QFxTextEdit); - if(d->color == color) + if (d->color == color) return; clearCache(); @@ -370,7 +370,7 @@ void QFxTextEdit::setWrap(bool w) void QFxTextEdit::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { - if(newGeometry.width() != oldGeometry.width()) + if (newGeometry.width() != oldGeometry.width()) updateSize(); QFxImageItem::geometryChanged(newGeometry, oldGeometry); } |