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

2 files changed, 2 insertions, 10 deletions

diff --git a/src/declarative/qml/qmllist.h b/src/declarative/qml/qmllist.h
index 3a1e665..cc13924 100644
--- a/src/declarative/qml/qmllist.h
+++ b/src/declarative/qml/qmllist.h
@@ -56,7 +56,9 @@ class QmlList : private QmlPrivate::ListInterface
 public:
     virtual void append(T) = 0;
     virtual void insert(int, T) = 0;
+    virtual void removeAt(int) = 0;
     virtual T at(int) const = 0;
+    virtual int count() const = 0;
     virtual void clear() = 0;
     QmlList<T> &operator<<(T t) { append(t); return *this; }
 
diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp
index 584ccde..51d5607 100644
--- a/src/declarative/qml/qmlmetatype.cpp
+++ b/src/declarative/qml/qmlmetatype.cpp
@@ -667,11 +667,6 @@ QmlMetaType::attachedPropertiesFunc(const QByteArray &name)
 QMetaProperty QmlMetaType::defaultProperty(const QMetaObject *metaObject)
 {
     int idx = metaObject->indexOfClassInfo("DefaultProperty");
-    while(idx == -1 && metaObject) {
-        metaObject = metaObject->superClass();
-        if(metaObject)
-            idx = metaObject->indexOfClassInfo("DefaultProperty");
-    }
     if(-1 == idx)
         return QMetaProperty();
 
@@ -698,11 +693,6 @@ QMetaProperty QmlMetaType::defaultProperty(QObject *obj)
 QMetaMethod QmlMetaType::defaultMethod(const QMetaObject *metaObject)
 {
     int idx = metaObject->indexOfClassInfo("DefaultMethod");
-    while(idx == -1 && metaObject) {
-        metaObject = metaObject->superClass();
-        if(metaObject)
-            idx = metaObject->indexOfClassInfo("DefaultMethod");
-    }
     if(-1 == idx)
         return QMetaMethod();