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

2 files changed, 45 insertions, 36 deletions

diff --git a/src/declarative/fx/qfxtextinput.cpp b/src/declarative/fx/qfxtextinput.cpp
index b7b155a..05d2260 100644
--- a/src/declarative/fx/qfxtextinput.cpp
+++ b/src/declarative/fx/qfxtextinput.cpp
@@ -594,6 +594,7 @@ bool QFxTextInput::event(QEvent* ev)
     bool handled = false;
     switch(ev->type()){
         case QEvent::KeyPress:
+        case QEvent::KeyRelease://###Should the control be doing anything with release?
         case QEvent::GraphicsSceneMousePress:
             break;
         default:
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 69bed25..062ab48 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -239,41 +239,8 @@ struct ModelNode
         return objectCache;
     }
 
-    void setListValue(const QScriptValue& valuelist) {
-        QScriptValueIterator it(valuelist);
-        values.clear();
-        while (it.hasNext()) {
-            it.next();
-            ModelNode *value = new ModelNode;
-            QScriptValue v = it.value();
-            if (v.isArray()) {
-                value->setListValue(v);
-            } else if (v.isObject()) {
-                value->setObjectValue(v);
-            } else {
-                value->values << v.toVariant();
-            }
-            values.append(qVariantFromValue(value));
-
-        }
-    }
-
-    void setObjectValue(const QScriptValue& valuemap) {
-        QScriptValueIterator it(valuemap);
-        while (it.hasNext()) {
-            it.next();
-            ModelNode *value = new ModelNode;
-            QScriptValue v = it.value();
-            if (v.isArray()) {
-                value->setListValue(v);
-            } else if (v.isObject()) {
-                value->setObjectValue(v);
-            } else {
-                value->values << v.toVariant();
-            }
-            properties.insert(it.name(),value);
-        }
-    }
+    void setObjectValue(const QScriptValue& valuemap);
+    void setListValue(const QScriptValue& valuelist);
 
     void setProperty(const QString& prop, const QVariant& val) {
         QHash<QString, ModelNode *>::const_iterator it = properties.find(prop);
@@ -292,6 +259,48 @@ struct ModelNode
     ModelObject *objectCache;
 };
 
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(ModelNode *)
+
+QT_BEGIN_NAMESPACE
+void ModelNode::setObjectValue(const QScriptValue& valuemap) {
+    QScriptValueIterator it(valuemap);
+    while (it.hasNext()) {
+        it.next();
+        ModelNode *value = new ModelNode;
+        QScriptValue v = it.value();
+        if (v.isArray()) {
+            value->setListValue(v);
+        } else if (v.isObject()) {
+            value->setObjectValue(v);
+        } else {
+            value->values << v.toVariant();
+        }
+        properties.insert(it.name(),value);
+    }
+}
+
+void ModelNode::setListValue(const QScriptValue& valuelist) {
+    QScriptValueIterator it(valuelist);
+    values.clear();
+    while (it.hasNext()) {
+        it.next();
+        ModelNode *value = new ModelNode;
+        QScriptValue v = it.value();
+        if (v.isArray()) {
+            value->setListValue(v);
+        } else if (v.isObject()) {
+            value->setObjectValue(v);
+        } else {
+            value->values << v.toVariant();
+        }
+        values.append(qVariantFromValue(value));
+
+    }
+}
+
+
 ModelObject::ModelObject()
 : _mo(new QmlOpenMetaObject(this))
 {
@@ -846,7 +855,6 @@ ModelNode::~ModelNode()
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(ModelNode *)
 QML_DECLARE_TYPE(QmlListElement)
 
 #include "qmllistmodel.moc"