Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 15 insertions, 2 deletions

diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index 85e0a5a..fcc9e69 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -329,7 +329,7 @@ void QFxTextEdit::setHighlightColor(const QColor &color)
 QColor QFxTextEdit::highlightedTextColor() const
 {
     Q_D(const QFxTextEdit);
-    return d->highlightColor;
+    return d->highlightedTextColor;
 }
 
 void QFxTextEdit::setHighlightedTextColor(const QColor &color)
@@ -1001,11 +1001,24 @@ void QFxTextEdit::updateImgCache(const QRectF &r)
     emit update();
 }
 
+/*!
+    \qmlproperty bool TextEdit::smooth
+
+    Set this property if you want the text to be smoothly scaled or
+    transformed.  Smooth filtering gives better visual quality, but is slower.  If
+    the item is displayed at its natural size, this property has no visual or
+    performance effect.
+
+    \note Generally scaling artifacts are only visible if the item is stationary on
+    the screen.  A common pattern when animating an item is to disable smooth
+    filtering at the beginning of the animation and reenable it at the conclusion.
+*/
+
 void QFxTextEditPrivate::init()
 {
     Q_Q(QFxTextEdit);
 
-    q->setSmoothTransform(true);
+    q->setSmoothTransform(smooth);
     q->setAcceptedMouseButtons(Qt::LeftButton);
     q->setFlag(QGraphicsItem::ItemHasNoContents, false);
     q->setFlag(QGraphicsItem::ItemAcceptsInputMethod);