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

5 files changed, 11 insertions, 11 deletions

diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp
index 5fe9617..c227899 100644
--- a/src/declarative/fx/qfxflickable.cpp
+++ b/src/declarative/fx/qfxflickable.cpp
@@ -853,7 +853,7 @@ void QFxFlickablePrivate::data_append(QObject *o)
     Q_Q(QFxFlickable);
     QFxItem *i = qobject_cast<QFxItem *>(o);
     if (i)
-        viewport->children()->append(i);
+        viewport->fxChildren()->append(i);
     else
         o->setParent(q);
 }
@@ -884,7 +884,7 @@ QmlList<QObject *> *QFxFlickable::flickableData()
 QmlList<QFxItem *> *QFxFlickable::flickableChildren()
 {
     Q_D(QFxFlickable);
-    return d->viewport->children();
+    return d->viewport->fxChildren();
 }
 
 /*!
diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp
index 8e56e43..dc5101c 100644
--- a/src/declarative/fx/qfxflipable.cpp
+++ b/src/declarative/fx/qfxflipable.cpp
@@ -146,7 +146,7 @@ void QFxFlipable::setFront(QFxItem *front)
         return;
     }
     d->front = front;
-    children()->append(d->front);
+    fxChildren()->append(d->front);
     if (Back == d->current)
         d->front->setOpacity(0.);
 }
@@ -165,7 +165,7 @@ void QFxFlipable::setBack(QFxItem *back)
         return;
     }
     d->back = back;
-    children()->append(d->back);
+    fxChildren()->append(d->back);
     if (Front == d->current)
         d->back->setOpacity(0.);
 }
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index 3429010..a2c744e 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -1473,7 +1473,7 @@ void QFxItemPrivate::data_append(QObject *o)
     Q_Q(QFxItem);
     QFxItem *i = qobject_cast<QFxItem *>(o);
     if (i)
-        q->children()->append(i);
+        q->fxChildren()->append(i);
     else
         resources_append(o);
 }
@@ -2271,7 +2271,7 @@ void QFxItem::focusChanged(bool flag)
     emit focusChanged();
 }
 
-QmlList<QFxItem *> *QFxItem::children()
+QmlList<QFxItem *> *QFxItem::fxChildren()
 {
     Q_D(QFxItem);
     return &(d->children);
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h
index 643987d..c6a5311 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qfxitem.h
@@ -70,7 +70,7 @@ class Q_DECLARATIVE_EXPORT QFxItem : public QGraphicsObject, public QmlParserSta
 
     Q_PROPERTY(QFxItem * parent READ parentItem WRITE setParentItem NOTIFY parentChanged DESIGNABLE false FINAL)
     Q_PROPERTY(QmlList<QObject *> *data READ data DESIGNABLE false)
-    Q_PROPERTY(QmlList<QFxItem *>* children READ children DESIGNABLE false)
+    Q_PROPERTY(QmlList<QFxItem *>* children READ fxChildren DESIGNABLE false)
     Q_PROPERTY(QmlList<QObject *>* resources READ resources DESIGNABLE false)
     Q_PROPERTY(QmlList<QmlState *>* states READ states DESIGNABLE false)
     Q_PROPERTY(QmlList<QmlTransition *>* transitions READ transitions DESIGNABLE false)
@@ -112,7 +112,7 @@ public:
     void setParent(QFxItem *parent) { setParentItem(parent); }
 
     QmlList<QObject *> *data();
-    QmlList<QFxItem *> *children();
+    QmlList<QFxItem *> *fxChildren();
     QmlList<QObject *> *resources();
 
     QFxAnchors *anchors();
diff --git a/src/declarative/fx/qfxtextinput.cpp b/src/declarative/fx/qfxtextinput.cpp
index 39a0187..6bd793b 100644
--- a/src/declarative/fx/qfxtextinput.cpp
+++ b/src/declarative/fx/qfxtextinput.cpp
@@ -483,11 +483,11 @@ void QFxTextInput::keyPressEvent(QKeyEvent* ev)
     if((d->control->cursor() == 0 && ev->key() == Qt::Key_Left)
             || (d->control->cursor() == d->control->text().length()
                 && ev->key() == Qt::Key_Right)){
-        //ignore moving off the end
+        //ignore when moving off the end
         ev->ignore();
-        return;
+    }else{
+        d->control->processKeyEvent(ev);
     }
-    d->control->processKeyEvent(ev);
     if (!ev->isAccepted())
         QFxPaintedItem::keyPressEvent(ev);
 }