Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

26 files changed, 264 insertions, 376 deletions

diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp
index a7dc8fa..4740a89 100644
--- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
@@ -235,7 +235,7 @@ QInotifyFileSystemWatcherEngine::QInotifyFileSystemWatcherEngine(int fd)
 
 QInotifyFileSystemWatcherEngine::~QInotifyFileSystemWatcherEngine()
 {
-    foreach (int id, pathToID.values())
+    foreach (int id, pathToID)
         inotify_rm_watch(inotifyFd, id < 0 ? -id : id);
 
     ::close(inotifyFd);
diff --git a/src/corelib/io/qfilesystemwatcher_kqueue.cpp b/src/corelib/io/qfilesystemwatcher_kqueue.cpp
index f088ded..8396481 100644
--- a/src/corelib/io/qfilesystemwatcher_kqueue.cpp
+++ b/src/corelib/io/qfilesystemwatcher_kqueue.cpp
@@ -109,7 +109,7 @@ QKqueueFileSystemWatcherEngine::~QKqueueFileSystemWatcherEngine()
     close(kqpipe[0]);
     close(kqpipe[1]);
 
-    foreach (int id, pathToID.values())
+    foreach (int id, pathToID)
         ::close(id < 0 ? -id : id);
 }
 
diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp
index dbf422e..8b9cec8 100644
--- a/src/corelib/kernel/qabstractitemmodel.cpp
+++ b/src/corelib/kernel/qabstractitemmodel.cpp
@@ -1245,7 +1245,7 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
 /*!
     \fn QModelIndex QAbstractItemModel::parent(const QModelIndex &index) const = 0
 
-    Returns the parent of the model item with the given \a index. If the model
+    Returns the parent of the model item with the given \a index. If the item
     has no parent, an invalid QModelIndex is returned.
 
     A common convention used in models that expose tree data structures is that
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index 8973cb4..ed5b18f 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
@@ -1000,7 +1000,7 @@ class QmlGraphicsKeysAttached : public QObject, public QmlGraphicsItemKeyFilter
     Q_DECLARE_PRIVATE(QmlGraphicsKeysAttached)
 
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
-    Q_PROPERTY(QList<QmlGraphicsItem *> *forwardTo READ forwardTo)
+    Q_PROPERTY(QmlListProperty<QmlGraphicsItem> forwardTo READ forwardTo)
 
 public:
     QmlGraphicsKeysAttached(QObject *parent=0);
@@ -1015,9 +1015,9 @@ public:
         }
     }
 
-    QList<QmlGraphicsItem *> *forwardTo() {
+    QmlListProperty<QmlGraphicsItem> forwardTo() {
         Q_D(QmlGraphicsKeysAttached);
-        return &d->targets;
+        return QmlListProperty<QmlGraphicsItem>(this, d->targets);
     }
 
     virtual void componentComplete();
diff --git a/src/declarative/graphicsitems/qmlgraphicspath.cpp b/src/declarative/graphicsitems/qmlgraphicspath.cpp
index 18f27af..2bac4b6 100644
--- a/src/declarative/graphicsitems/qmlgraphicspath.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspath.cpp
@@ -163,10 +163,10 @@ bool QmlGraphicsPath::isClosed() const
     \snippet doc/src/snippets/declarative/pathview/pathattributes.qml 2
 */
 
-QList<QmlGraphicsPathElement *>* QmlGraphicsPath::pathElements()
+QmlListProperty<QmlGraphicsPathElement> QmlGraphicsPath::pathElements()
 {
     Q_D(QmlGraphicsPath);
-    return &(d->_pathElements);
+    return QmlListProperty<QmlGraphicsPathElement>(this, d->_pathElements);
 }
 
 void QmlGraphicsPath::interpolate(int idx, const QString &name, qreal value)
diff --git a/src/declarative/graphicsitems/qmlgraphicspath_p.h b/src/declarative/graphicsitems/qmlgraphicspath_p.h
index 2b4b0fd..50ea15b 100644
--- a/src/declarative/graphicsitems/qmlgraphicspath_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspath_p.h
@@ -189,7 +189,7 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsPath : public QObject, public QmlParserSta
     Q_OBJECT
 
     Q_INTERFACES(QmlParserStatus)
-    Q_PROPERTY(QList<QmlGraphicsPathElement *>* pathElements READ pathElements)
+    Q_PROPERTY(QmlListProperty<QmlGraphicsPathElement> pathElements READ pathElements)
     Q_PROPERTY(qreal startX READ startX WRITE setStartX)
     Q_PROPERTY(qreal startY READ startY WRITE setStartY)
     Q_PROPERTY(bool closed READ isClosed NOTIFY changed)
@@ -199,7 +199,7 @@ public:
     QmlGraphicsPath(QObject *parent=0);
     ~QmlGraphicsPath();
 
-    QList<QmlGraphicsPathElement *>* pathElements();
+    QmlListProperty<QmlGraphicsPathElement> pathElements();
 
     qreal startX() const;
     void setStartX(qreal x);
diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h b/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
index 4f4c1cf..b8c2179 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
@@ -107,14 +107,14 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsGradient : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QList<QmlGraphicsGradientStop *> *stops READ stops)
+    Q_PROPERTY(QmlListProperty<QmlGraphicsGradientStop> stops READ stops)
     Q_CLASSINFO("DefaultProperty", "stops")
 
 public:
     QmlGraphicsGradient(QObject *parent=0) : QObject(parent), m_gradient(0) {}
     ~QmlGraphicsGradient() { delete m_gradient; }
 
-    QList<QmlGraphicsGradientStop *> *stops() { return &m_stops; }
+    QmlListProperty<QmlGraphicsGradientStop> stops() { return QmlListProperty<QmlGraphicsGradientStop>(this, m_stops); }
 
     const QGradient *gradient() const;
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
index 2fc143d..4f5b53c 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
@@ -463,7 +463,7 @@ int QmlGraphicsVisualDataModelDataMetaObject::createProperty(const char *name, c
 
     if ((!model->m_listModelInterface || !model->m_abstractItemModel) && model->m_listAccessor) {
         if (model->m_listAccessor->type() == QmlListAccessor::QmlList
-            || model->m_listAccessor->type() == QmlListAccessor::QListPtr) {
+            || model->m_listAccessor->type() == QmlListAccessor::ListProperty) {
             model->ensureRoles();
             QObject *object = model->m_listAccessor->at(data->m_index).value<QObject*>();
             if (object && object->property(name).isValid())
@@ -725,7 +725,7 @@ void QmlGraphicsVisualDataModel::setModel(const QVariant &model)
     }
     d->m_listAccessor = new QmlListAccessor;
     d->m_listAccessor->setList(model, d->m_context?d->m_context->engine():qmlEngine(this));
-    if (d->m_listAccessor->type() != QmlListAccessor::QmlList && d->m_listAccessor->type() != QmlListAccessor::QListPtr)
+    if (d->m_listAccessor->type() != QmlListAccessor::QmlList && d->m_listAccessor->type() != QmlListAccessor::ListProperty)
         d->m_metaDataCacheable = true;
     if (d->m_delegate && d->modelCount()) {
         emit itemsInserted(0, d->modelCount());
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h
index c009093..859fd66 100644
--- a/src/declarative/qml/qml.h
+++ b/src/declarative/qml/qml.h
@@ -59,11 +59,11 @@ QT_MODULE(Declarative)
 
 #define QML_DECLARE_TYPE(TYPE) \
     Q_DECLARE_METATYPE(TYPE *) \
-    Q_DECLARE_METATYPE(QList<TYPE *> *) \
+    Q_DECLARE_METATYPE(QmlListProperty<TYPE>) \
     Q_DECLARE_METATYPE(QmlList<TYPE *> *)
 
 #define QML_DECLARE_TYPE_HASMETATYPE(TYPE) \
-    Q_DECLARE_METATYPE(QList<TYPE *> *) \
+    Q_DECLARE_METATYPE(QmlListProperty<TYPE>) \
     Q_DECLARE_METATYPE(QmlList<TYPE *> *)
 
 #define QML_DECLARE_INTERFACE(INTERFACE) \
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index f4dcb7a..81988ed 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -543,6 +543,7 @@ void QmlEngine::setContextForObject(QObject *object, QmlContext *context)
     data->context = context;
     data->nextContextObject = context->d_func()->contextObjects;
     data->prevContextObject = &context->d_func()->contextObjects;
+    context->d_func()->contextObjects = data;
 }
 
 void qmlExecuteDeferred(QObject *object)
diff --git a/src/declarative/qml/qmllist.h b/src/declarative/qml/qmllist.h
index ad2d874..b1a81c4 100644
--- a/src/declarative/qml/qmllist.h
+++ b/src/declarative/qml/qmllist.h
@@ -119,6 +119,72 @@ class Qml_ProxyList_ ##ListName : public QmlList<ListType> \
 friend class Qml_ProxyList_ ##ListName ; \
 Qml_ProxyList_##ListName ListName;
 
+template<typename T>
+struct QmlListProperty {
+    typedef void (*AppendFunction)(QmlListProperty<T> *, T*);
+    typedef int (*CountFunction)(QmlListProperty<T> *);
+    typedef T *(*AtFunction)(QmlListProperty<T> *, int);
+    typedef void (*ClearFunction)(QmlListProperty<T> *);
+    typedef void (*InsertFunction)(QmlListProperty<T> *, int, T *);
+    typedef void (*RemoveAtFunction)(QmlListProperty<T> *, int);
+
+    QmlListProperty() 
+        : version(1), object(0), data(0), append(0), count(0), at(0), clear(0), insert(0), removeAt(0) {}
+    QmlListProperty(QObject *o, QList<T *> &list)
+        : version(1), object(o), data(&list), append(qlist_append), count(qlist_count), at(qlist_at),
+          clear(qlist_clear), insert(qlist_insert), removeAt(qlist_removeAt) {}
+    QmlListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = 0, AtFunction t = 0, 
+            ClearFunction l = 0, InsertFunction i = 0, RemoveAtFunction r = 0)
+        : version(1), object(o), data(d), append(a), count(c), at(t), clear(l), insert(i), removeAt(r) {}
+
+    bool operator==(const QmlListProperty &o) const {
+        return version == o.version &&
+               object == o.object &&
+               data == o.data &&
+               append == o.append &&
+               count == o.count &&
+               at == o.at &&
+               clear == o.clear &&
+               insert == o.insert &&
+               removeAt == o.removeAt;
+    }
+
+    int version;
+
+    QObject *object;
+    void *data;
+    
+    AppendFunction append;
+
+    CountFunction count;
+    AtFunction at;
+
+    ClearFunction clear;
+
+    InsertFunction insert;
+    RemoveAtFunction removeAt;
+
+private:
+    static void qlist_append(QmlListProperty *p, T *v) {
+        ((QList<T *> *)p->data)->append(v); 
+    }
+    static int qlist_count(QmlListProperty *p) {
+        return ((QList<T *> *)p->data)->count();
+    }
+    static T *qlist_at(QmlListProperty *p, int idx) {
+        return ((QList<T *> *)p->data)->at(idx);
+    }
+    static void qlist_clear(QmlListProperty *p) {
+        return ((QList<T *> *)p->data)->clear();
+    }
+    static void qlist_insert(QmlListProperty *p, int idx, T *v) {
+        return ((QList<T *> *)p->data)->insert(idx, v);
+    }
+    static void qlist_removeAt(QmlListProperty *p, int idx) {
+        return ((QList<T *> *)p->data)->removeAt(idx);
+    }
+};
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/declarative/qml/qmllistscriptclass.cpp b/src/declarative/qml/qmllistscriptclass.cpp
index d4cdc6e..caa4e4e 100644
--- a/src/declarative/qml/qmllistscriptclass.cpp
+++ b/src/declarative/qml/qmllistscriptclass.cpp
@@ -111,27 +111,31 @@ QmlListScriptClass::ScriptValue QmlListScriptClass::property(Object *obj, const
     if (!data->object) 
         return Value();
 
-    void *list = 0;
-    void *args[] = { &list, 0 };
-    QMetaObject::metacall(data->object, QMetaObject::ReadProperty, 
-                          data->propertyIdx, args);
+    if (data->type == ListProperty) {
+        QmlListProperty<QObject> list;
+        void *args[] = { &list, 0 };
 
-    if (!list)
-        return Value();
-
-    if (data->type == QListPtr) {
-        const QList<QObject *> &qlist = *((QList<QObject *>*)list);
+        QMetaObject::metacall(data->object, QMetaObject::ReadProperty, 
+                data->propertyIdx, args);
 
-        quint32 count = qlist.count();
+        quint32 count = list.count(&list);
 
         if (name == m_lengthId.identifier)
             return Value(scriptEngine, count);
         else if (lastIndex < count)
-            return Value(scriptEngine, enginePriv->objectClass->newQObject(qlist.at(lastIndex)));
+            return Value(scriptEngine, enginePriv->objectClass->newQObject(list.at(&list, lastIndex)));
         else
             return Value();
 
     } else {
+        void *list = 0;
+        void *args[] = { &list, 0 };
+        QMetaObject::metacall(data->object, QMetaObject::ReadProperty, 
+                data->propertyIdx, args);
+
+        if (!list)
+            return Value();
+
         Q_ASSERT(data->type == QmlListPtr);
         const QmlList<QObject *> &qmllist = *((QmlList<QObject *>*)list);
 
@@ -155,18 +159,29 @@ QVariant QmlListScriptClass::toVariant(Object *obj, bool *ok)
         return QVariant();
     }
 
-    void *list = 0;
-    void *args[] = { &list, 0 };
-    QMetaObject::metacall(data->object, QMetaObject::ReadProperty, 
-                          data->propertyIdx, args);
+    if (data->type == QmlListScriptClass::QmlListPtr) {
+        void *list = 0;
+        void *args[] = { &list, 0 };
+        QMetaObject::metacall(data->object, QMetaObject::ReadProperty, 
+                              data->propertyIdx, args);
 
-    if (!list) {
-        if (ok) *ok = false;
-        return QVariant();
-    }
+        if (!list) {
+            if (ok) *ok = false;
+            return QVariant();
+        }
+
+        if (ok) *ok = true;
+        return QVariant(data->propertyType, &list);
+    } else {
+        QmlListProperty<QObject> list;
+        void *args[] = { &list, 0 };
+
+        QMetaObject::metacall(data->object, QMetaObject::ReadProperty, 
+                              data->propertyIdx, args);
 
-    if (ok) *ok = true;
-    return QVariant(data->propertyType, &list);
+        if (ok) *ok = true;
+        return QVariant(data->propertyType, &list);
+    }
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmllistscriptclass_p.h b/src/declarative/qml/qmllistscriptclass_p.h
index e484b34..464f91e 100644
--- a/src/declarative/qml/qmllistscriptclass_p.h
+++ b/src/declarative/qml/qmllistscriptclass_p.h
@@ -64,7 +64,7 @@ public:
     QmlListScriptClass(QmlEngine *);
     ~QmlListScriptClass();
 
-    enum ListCategory { QListPtr, QmlListPtr };
+    enum ListCategory { ListProperty, QmlListPtr };
     QScriptValue newList(QObject *, int, ListCategory, int);
 
 protected:
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 09c936e..a0857df 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -892,7 +892,8 @@ bool QmlMetaPropertyPrivate::write(QObject *object, const QmlPropertyCache::Data
             QVariant listVar = prop.read(object);
             QmlMetaType::clear(listVar);
             for (int ii = 0; ii < list.count(); ++ii) {
-                QVariant v = QmlMetaType::fromObject(list.at(ii), listType);
+                QObject *o = list.at(ii);
+                QVariant v = QVariant(listType, &o);
                 QmlMetaType::append(listVar, v);
             }
 
diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp
index d9c007d..973f04f 100644
--- a/src/declarative/qml/qmlmetatype.cpp
+++ b/src/declarative/qml/qmlmetatype.cpp
@@ -124,7 +124,7 @@ public:
     int m_version_maj;
     int m_version_min;
     int m_typeId; int m_listId; int m_qmlListId;
-    QmlPrivate::Func m_opFunc;
+    QObject *(*m_newFunc)();
     const QMetaObject *m_baseMetaObject;
     QmlAttachedPropertiesFunc m_attachedPropertiesFunc;
     const QMetaObject *m_attachedPropertiesType;
@@ -141,15 +141,14 @@ public:
 
 QmlTypePrivate::QmlTypePrivate()
 : m_isInterface(false), m_iid(0), m_typeId(0), m_listId(0), m_qmlListId(0),
-  m_opFunc(0), m_baseMetaObject(0), m_attachedPropertiesFunc(0), m_attachedPropertiesType(0),
+  m_newFunc(0), m_baseMetaObject(0), m_attachedPropertiesFunc(0), m_attachedPropertiesType(0),
   m_parserStatusCast(-1), m_propertyValueSourceCast(-1), m_propertyValueInterceptorCast(-1),
   m_extFunc(0), m_extMetaObject(0), m_index(-1), m_customParser(0), m_isSetup(false)
 {
 }
 
 
-QmlType::QmlType(int type, int listType, int qmlListType,
-                 QmlPrivate::Func opFunc, const char *iid, int index)
+QmlType::QmlType(int type, int listType, int qmlListType, const char *iid, int index)
 : d(new QmlTypePrivate)
 {
     d->m_isInterface = true;
@@ -157,7 +156,7 @@ QmlType::QmlType(int type, int listType, int qmlListType,
     d->m_typeId = type;
     d->m_listId = listType;
     d->m_qmlListId = qmlListType;
-    d->m_opFunc = opFunc;
+    d->m_newFunc = 0;
     d->m_index = index;
     d->m_isSetup = true;
     d->m_version_maj = 0;
@@ -165,7 +164,7 @@ QmlType::QmlType(int type, int listType, int qmlListType,
 }
 
 QmlType::QmlType(int type, int listType, int qmlListType,
-                 QmlPrivate::Func opFunc, const char *qmlName,
+                 QObject *(*newFunc)(), const char *qmlName,
                  int version_maj, int version_min,
                  const QMetaObject *metaObject,
                  QmlAttachedPropertiesFunc attachedPropertiesFunc,
@@ -182,7 +181,7 @@ QmlType::QmlType(int type, int listType, int qmlListType,
     d->m_typeId = type;
     d->m_listId = listType;
     d->m_qmlListId = qmlListType;
-    d->m_opFunc = opFunc;
+    d->m_newFunc = newFunc;
     d->m_baseMetaObject = metaObject;
     d->m_attachedPropertiesFunc = attachedPropertiesFunc;
     d->m_attachedPropertiesType = attachedType;
@@ -282,10 +281,7 @@ QObject *QmlType::create() const
 {
     d->init();
 
-    QVariant v;
-    QObject *rv = 0;
-    d->m_opFunc(QmlPrivate::Create, 0, v, v, (void **)&rv);
-
+    QObject *rv = d->m_newFunc();
     if (rv && !d->m_metaObjects.isEmpty())
         (void *)new QmlProxyMetaObject(rv, &d->m_metaObjects);
 
@@ -320,29 +316,35 @@ int QmlType::qmlListTypeId() const
 void QmlType::listClear(const QVariant &list)
 {
     Q_ASSERT(list.userType() == qListTypeId());
-    QVariant arg;
-    d->m_opFunc(QmlPrivate::Clear, 0, list, arg, 0);
+    QmlListProperty<void> *l = (QmlListProperty<void> *)list.data();
+    if (l->clear) l->clear(l);
 }
 
 void QmlType::listAppend(const QVariant &list, const QVariant &item)
 {
     Q_ASSERT(list.userType() == qListTypeId());
-    d->m_opFunc(QmlPrivate::Append, 0, list, item, 0);
+    QmlListProperty<void> *l = (QmlListProperty<void> *)list.data();
+    if (l->append) l->append(l, *(void **)item.data());
 }
 
 QVariant QmlType::listAt(const QVariant &list, int idx)
 {
     Q_ASSERT(list.userType() == qListTypeId());
-    QVariant rv;
-    void *ptr = (void *)&rv;
-    d->m_opFunc(QmlPrivate::Value, idx, list, QVariant(), &ptr);
-    return rv;
+    QmlListProperty<void> *l = (QmlListProperty<void> *)list.data();
+    if (l->at) {
+        void *v = l->at(l, idx);
+        return QVariant(typeId(), &v);
+    } else {
+        return QVariant();
+    }
 }
 
 int QmlType::listCount(const QVariant &list)
 {
     Q_ASSERT(list.userType() == qListTypeId());
-    return d->m_opFunc(QmlPrivate::Length, 0, list, QVariant(), 0);
+    QmlListProperty<void> *l = (QmlListProperty<void> *)list.data();
+    if (l->count) return l->count(l);
+    return 0;
 }
 
 const QMetaObject *QmlType::metaObject() const
@@ -386,15 +388,6 @@ int QmlType::propertyValueInterceptorCast() const
     return d->m_propertyValueInterceptorCast;
 }
 
-QVariant QmlType::fromObject(QObject *obj) const
-{
-    QVariant rv;
-    QVariant *v_ptr = &rv;
-    QVariant vobj = QVariant::fromValue(obj);
-    d->m_opFunc(QmlPrivate::FromObject, 0, QVariant(), vobj, (void **)&v_ptr);
-    return rv;
-}
-
 const char *QmlType::interfaceIId() const
 {
     return d->m_iid;
@@ -406,7 +399,6 @@ int QmlType::index() const
 }
 
 int QmlMetaType::registerInterface(const QmlPrivate::MetaTypeIds &id,
-                                    QmlPrivate::Func listFunction,
                                     const char *iid)
 {
     QWriteLocker lock(metaTypeDataLock());
@@ -415,7 +407,7 @@ int QmlMetaType::registerInterface(const QmlPrivate::MetaTypeIds &id,
     int index = data->types.count();
 
     QmlType *type = new QmlType(id.typeId, id.listId, id.qmlListId,
-                                listFunction, iid, index);
+                                iid, index);
 
     data->types.append(type);
     data->idToType.insert(type->typeId(), type);
@@ -438,7 +430,7 @@ int QmlMetaType::registerInterface(const QmlPrivate::MetaTypeIds &id,
     return index;
 }
 
-int QmlMetaType::registerType(const QmlPrivate::MetaTypeIds &id, QmlPrivate::Func func,
+int QmlMetaType::registerType(const QmlPrivate::MetaTypeIds &id, QObject *(*func)(),
         const char *uri, int version_maj, int version_min, const char *cname,
         const QMetaObject *mo, QmlAttachedPropertiesFunc attach, const QMetaObject *attachMo,
         int pStatus, int object, int valueSource, int valueInterceptor, QmlPrivate::CreateFunc extFunc, const QMetaObject *extmo, QmlCustomParser *parser)
@@ -593,18 +585,6 @@ bool QmlMetaType::append(const QVariant &list, const QVariant &item)
     }
 }
 
-QVariant QmlMetaType::fromObject(QObject *obj, int typeId)
-{
-    QReadLocker lock(metaTypeDataLock());
-    QmlMetaTypeData *data = metaTypeData();
-
-    QmlType *type = data->idToType.value(typeId);
-    if (type && type->typeId() == typeId)
-        return type->fromObject(obj);
-    else
-        return QVariant();
-}
-
 const QMetaObject *QmlMetaType::rawMetaObjectForType(int id)
 {
     if (id == QMetaType::QObjectStar)
diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h
index e0c65c5..32174ff 100644
--- a/src/declarative/qml/qmlmetatype.h
+++ b/src/declarative/qml/qmlmetatype.h
@@ -46,6 +46,7 @@
 #include "qmlparserstatus.h"
 #include "qmlpropertyvaluesource.h"
 #include "qmlpropertyvalueinterceptor.h"
+#include "qmllist.h"
 
 #include <QtCore/qglobal.h>
 #include <QtCore/qvariant.h>
@@ -62,8 +63,8 @@ class QmlCustomParser;
 class Q_DECLARATIVE_EXPORT QmlMetaType
 {
 public:
-    static int registerType(const QmlPrivate::MetaTypeIds &, QmlPrivate::Func, const char *, int vmaj, int vmin, const char *qmlName, const QMetaObject *, QmlAttachedPropertiesFunc, const QMetaObject *, int pStatus, int object, int valueSource, int valueInterceptor, QmlPrivate::CreateFunc extFunc, const QMetaObject *extmo, QmlCustomParser *);
-    static int registerInterface(const QmlPrivate::MetaTypeIds &, QmlPrivate::Func, const char *);
+    static int registerType(const QmlPrivate::MetaTypeIds &, QObject *(*)(), const char *, int vmaj, int vmin, const char *qmlName, const QMetaObject *, QmlAttachedPropertiesFunc, const QMetaObject *, int pStatus, int object, int valueSource, int valueInterceptor, QmlPrivate::CreateFunc extFunc, const QMetaObject *extmo, QmlCustomParser *);
+    static int registerInterface(const QmlPrivate::MetaTypeIds &, const char *);
 
     static bool copy(int type, void *data, const void *copy = 0);
 
@@ -86,7 +87,6 @@ public:
     static int listType(int);
     static bool clear(const QVariant &);
     static bool append(const QVariant &, const QVariant &);
-    static QVariant fromObject(QObject *, int type);
     static const QMetaObject *rawMetaObjectForType(int);
     static const QMetaObject *metaObjectForType(int);
     static int attachedPropertiesFuncId(const QMetaObject *);
@@ -142,7 +142,6 @@ public:
     const QMetaObject *attachedPropertiesType() const;
 
     int parserStatusCast() const;
-    QVariant fromObject(QObject *) const;
     const char *interfaceIId() const;
     int propertyValueSourceCast() const;
     int propertyValueInterceptorCast() const;
@@ -152,8 +151,8 @@ private:
     friend class QmlMetaType;
     friend class QmlTypePrivate;
     friend struct QmlMetaTypeData;
-    QmlType(int, int, int, QmlPrivate::Func, const char *, int);
-    QmlType(int, int, int, QmlPrivate::Func, const char *, int, int, const QMetaObject *, QmlAttachedPropertiesFunc, const QMetaObject *, int, int, int, QmlPrivate::CreateFunc, const QMetaObject *, int, QmlCustomParser *);
+    QmlType(int, int, int, const char *, int);
+    QmlType(int, int, int, QObject *(*)(), const char *, int, int, const QMetaObject *, QmlAttachedPropertiesFunc, const QMetaObject *, int, int, int, QmlPrivate::CreateFunc, const QMetaObject *, int, QmlCustomParser *);
     ~QmlType();
 
     QmlTypePrivate *d;
@@ -165,11 +164,11 @@ int qmlRegisterType(const char *typeName)
     QByteArray name(typeName);
     QmlPrivate::MetaTypeIds ids = {
         qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<T *>(QByteArray("QList<" + name + "*>*").constData()),
-        qRegisterMetaType<T *>(QByteArray("QmlList<" + name + "*>*").constData())
+        qRegisterMetaType<QmlListProperty<T> >(QByteArray("QmlListProperty<" + name + ">").constData()),
+        qRegisterMetaType<QmlList<T *>*>(QByteArray("QmlList<" + name + "*>*").constData())
     };
 
-    return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, 0, 0, 0,
+    return QmlMetaType::registerType(ids, 0, 0, 0, 0, 0,
             &T::staticMetaObject,
             QmlPrivate::attachedPropertiesFunc<T>(),
             QmlPrivate::attachedPropertiesMetaObject<T>(),
@@ -186,11 +185,11 @@ int qmlRegisterType(const char *uri, int version_maj, int version_min, const cha
     QByteArray name(typeName);
     QmlPrivate::MetaTypeIds ids = {
         qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<T *>(QByteArray("QList<" + name + "*>*").constData()),
-        qRegisterMetaType<T *>(QByteArray("QmlList<" + name + "*>*").constData())
+        qRegisterMetaType<QmlListProperty<T> >(QByteArray("QmlListProperty<" + name + ">").constData()),
+        qRegisterMetaType<QmlList<T *>*>(QByteArray("QmlList<" + name + "*>*").constData())
     };
 
-    return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>,
+    return QmlMetaType::registerType(ids, QmlPrivate::create<T>, 
             uri, version_maj, version_min, qmlName, 
             &T::staticMetaObject,
             QmlPrivate::attachedPropertiesFunc<T>(),
@@ -208,8 +207,8 @@ int qmlRegisterExtendedType(const char *typeName)
     QByteArray name(typeName);
     QmlPrivate::MetaTypeIds ids = {
         qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<T *>(QByteArray("QList<" + name + "*>*").constData()),
-        qRegisterMetaType<T *>(QByteArray("QmlList<" + name + "*>*").constData())
+        qRegisterMetaType<QmlListProperty<T> >(QByteArray("QmlListProperty<" + name + ">").constData()),
+        qRegisterMetaType<QmlList<T *>*>(QByteArray("QmlList<" + name + "*>*").constData())
     };
 
     QmlAttachedPropertiesFunc attached = 
@@ -221,7 +220,7 @@ int qmlRegisterExtendedType(const char *typeName)
         attachedMo = QmlPrivate::attachedPropertiesMetaObject<T>();
     }
 
-    return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, 0, 0, 0,
+    return QmlMetaType::registerType(ids, 0, 0, 0, 0, 0,
             &T::staticMetaObject, attached, attachedMo,
             QmlPrivate::StaticCastSelector<T,QmlParserStatus>::cast(), 
             QmlPrivate::StaticCastSelector<T,QObject>::cast(),
@@ -236,8 +235,8 @@ int qmlRegisterExtendedType(const char *uri, int version_maj, int version_min, c
     QByteArray name(typeName);
     QmlPrivate::MetaTypeIds ids = {
         qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<T *>(QByteArray("QList<" + name + "*>*").constData()),
-        qRegisterMetaType<T *>(QByteArray("QmlList<" + name + "*>*").constData())
+        qRegisterMetaType<QmlListProperty<T> >(QByteArray("QmlListProperty<" + name + ">").constData()),
+        qRegisterMetaType<QmlList<T *>*>(QByteArray("QmlList<" + name + "*>*").constData())
     };
 
     QmlAttachedPropertiesFunc attached = 
@@ -249,7 +248,7 @@ int qmlRegisterExtendedType(const char *uri, int version_maj, int version_min, c
         attachedMo = QmlPrivate::attachedPropertiesMetaObject<T>();
     }
 
-    return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>, 
+    return QmlMetaType::registerType(ids, QmlPrivate::create<T>, 
             uri, version_maj, version_min, qmlName, 
             &T::staticMetaObject,
             attached, attachedMo,
@@ -267,13 +266,11 @@ int qmlRegisterInterface(const char *typeName)
     QByteArray name(typeName);
     QmlPrivate::MetaTypeIds ids = {
         qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<T *>(QByteArray("QList<" + name + "*>*").constData()),
-        qRegisterMetaType<T *>(QByteArray("QmlList<" + name + "*>*").constData())
+        qRegisterMetaType<QmlListProperty<T> >(QByteArray("QmlListProperty<" + name + ">").constData()),
+        qRegisterMetaType<QmlList<T *>*>(QByteArray("QmlList<" + name + "*>*").constData())
     };
 
-    return QmlMetaType::registerInterface(ids, 
-            QmlPrivate::list_interface_op<T>, 
-            qobject_interface_iid<T *>());
+    return QmlMetaType::registerInterface(ids, qobject_interface_iid<T *>());
 }
 
 template<typename T>
@@ -282,11 +279,11 @@ int qmlRegisterCustomType(const char *uri, int version_maj, int version_min, con
     QByteArray name(typeName);
     QmlPrivate::MetaTypeIds ids = {
         qRegisterMetaType<T *>(QByteArray(name + '*').constData()),
-        qRegisterMetaType<T *>(QByteArray("QList<" + name + "*>*").constData()),
-        qRegisterMetaType<T *>(QByteArray("QmlList<" + name + "*>*").constData())
+        qRegisterMetaType<QmlListProperty<T> >(QByteArray("QmlListProperty<" + name + ">").constData()),
+        qRegisterMetaType<QmlList<T *>*>(QByteArray("QmlList<" + name + "*>*").constData())
     };
 
-    return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>,
+    return QmlMetaType::registerType(ids, QmlPrivate::create<T>, 
             uri, version_maj, version_min, qmlName, 
             &T::staticMetaObject,
             QmlPrivate::attachedPropertiesFunc<T>(),
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp
index 7bbb7df..09d326f 100644
--- a/src/declarative/qml/qmlobjectscriptclass.cpp
+++ b/src/declarative/qml/qmlobjectscriptclass.cpp
@@ -238,7 +238,7 @@ QmlObjectScriptClass::property(QObject *obj, const Identifier &name)
         }
 
         if (lastData->flags & QmlPropertyCache::Data::IsQList) {
-            return Value(scriptEngine, enginePriv->listClass->newList(obj, lastData->coreIndex, QmlListScriptClass::QListPtr, lastData->propType));
+            return Value(scriptEngine, enginePriv->listClass->newList(obj, lastData->coreIndex, QmlListScriptClass::ListProperty, lastData->propType));
         } else if (lastData->flags & QmlPropertyCache::Data::IsQmlList) {
             return Value(scriptEngine, enginePriv->listClass->newList(obj, lastData->coreIndex, QmlListScriptClass::QmlListPtr, lastData->propType));
         } else if (lastData->flags & QmlPropertyCache::Data::IsQObjectDerived) {
diff --git a/src/declarative/qml/qmlprivate.h b/src/declarative/qml/qmlprivate.h
index dd98110..c367497 100644
--- a/src/declarative/qml/qmlprivate.h
+++ b/src/declarative/qml/qmlprivate.h
@@ -85,26 +85,8 @@ namespace QmlPrivate
         virtual void clear() = 0;
     };
 
-    enum ListOp { Append, Set, Insert, Prepend, Length, FromObject, 
-                  Object, Create, Value, Clear };
-
-    template<typename T>
-    int list_op(ListOp op, int val, 
-                const QVariant &vlist, 
-                const QVariant &value, 
-                void **out);
-
     template<typename T>
-    int list_nocreate_op(ListOp op, int val, 
-                         const QVariant &vlist, 
-                         const QVariant &value, 
-                         void **out);
-
-    template<typename T>
-    int list_interface_op(ListOp op, int val, 
-                          const QVariant &vlist, 
-                          const QVariant &value, 
-                          void **out);
+    QObject *create() { return new T; }
 
     template<class From, class To, int N>
     struct StaticCastSelectorClass
@@ -203,7 +185,6 @@ namespace QmlPrivate
         int listId;
         int qmlListId;
     };
-    typedef int (*Func)(QmlPrivate::ListOp, int, const QVariant &, const QVariant &, void **);
     typedef QObject *(*CreateFunc)(QObject *);
 
     template<typename T>
@@ -237,148 +218,6 @@ namespace QmlPrivate
     };
 }
 
-template<typename T>
-int QmlPrivate::list_op(QmlPrivate::ListOp op, int val, 
-                        const QVariant &vlist, 
-                        const QVariant &value, 
-                        void **out) 
-{ 
-    if (op == QmlPrivate::Create) { 
-        QObject *obj = static_cast<QObject *>(new T);
-        *((QObject **)out) = obj; 
-        return 0; 
-    } 
-    QList<T *> *list = vlist.value<QList<T *> *>(); 
-    switch(op) { 
-    case QmlPrivate::Append: 
-        list->append(value.value<T *>()); 
-        break; 
-    case QmlPrivate::Set: 
-        (*list)[val] = value.value<T *>(); 
-        break; 
-    case QmlPrivate::Insert: 
-        list->insert(val, value.value<T *>()); 
-        break; 
-    case QmlPrivate::Prepend: 
-        list->prepend(value.value<T *>()); 
-        break; 
-    case QmlPrivate::Length: 
-        return list->count(); 
-        break; 
-    case QmlPrivate::Clear: 
-        list->clear(); 
-        return 0; 
-        break; 
-    case QmlPrivate::Create: 
-        break; 
-    case QmlPrivate::Object: 
-        *out =  static_cast<QObject *>(value.value<T *>()); 
-        break; 
-    case QmlPrivate::FromObject: 
-        { 
-            QObject *fromObj = value.value<QObject *>(); 
-            T *me = qobject_cast<T *>(fromObj); 
-            if (me) { 
-                *((QVariant *)*out) = QVariant::fromValue(me); 
-            } 
-        } 
-        break; 
-    case QmlPrivate::Value: 
-        if (list->count() <= val) *((QVariant *)*out) = QVariant();
-        else *((QVariant *)*out) = QVariant::fromValue(list->at(val)); 
-        break; 
-    } 
-    return 0; 
-} 
-
-template<typename T>
-int QmlPrivate::list_nocreate_op(QmlPrivate::ListOp op, int val, 
-                                 const QVariant &vlist, 
-                                 const QVariant &value, 
-                                 void **out) 
-{ 
-    QList<T *> *list = vlist.value<QList<T *> *>(); 
-    switch(op) { 
-    case QmlPrivate::Append: 
-        list->append(value.value<T *>()); 
-        break; 
-    case QmlPrivate::Set: 
-        (*list)[val] = value.value<T *>(); 
-        break; 
-    case QmlPrivate::Insert: 
-        list->insert(val, value.value<T *>()); 
-        break; 
-    case QmlPrivate::Prepend: 
-        list->prepend(value.value<T *>()); 
-        break; 
-    case QmlPrivate::Length: 
-        return list->count(); 
-        break; 
-    case QmlPrivate::Clear: 
-        list->clear(); 
-        return 0; 
-        break; 
-    case QmlPrivate::Create: 
-        break; 
-    case QmlPrivate::Object: 
-        *out =  static_cast<QObject *>(value.value<T *>()); 
-        break; 
-    case QmlPrivate::FromObject: 
-        { 
-            QObject *fromObj = value.value<QObject *>(); 
-            T *me = qobject_cast<T *>(fromObj); 
-            if (me) { 
-                *((QVariant *)*out) = QVariant::fromValue(me); 
-            } 
-        } 
-        break; 
-    case QmlPrivate::Value: 
-        *((QVariant *)*out) = QVariant::fromValue(list->at(val)); 
-        break; 
-    } 
-    return 0; 
-} 
-
-template<typename T>
-int QmlPrivate::list_interface_op(QmlPrivate::ListOp op, int val, 
-                                  const QVariant &vlist, 
-                                  const QVariant &value, 
-                                  void **out) 
-{ 
-    QList<T *> *list = vlist.value<QList<T *> *>(); 
-    switch(op) { 
-    case QmlPrivate::Append: 
-        list->append(value.value<T *>()); 
-        break; 
-    case QmlPrivate::Set: 
-        (*list)[val] = value.value<T *>(); 
-        break; 
-    case QmlPrivate::Insert: 
-        list->insert(val, value.value<T *>()); 
-        break; 
-    case QmlPrivate::Prepend: 
-        list->prepend(value.value<T *>()); 
-        break; 
-    case QmlPrivate::Length: 
-        return list->count(); 
-        break; 
-    case QmlPrivate::Clear: 
-        list->clear(); 
-        return 0; 
-        break; 
-    case QmlPrivate::Create: 
-        break; 
-    case QmlPrivate::Object: 
-        break; 
-    case QmlPrivate::FromObject: 
-        break; 
-    case QmlPrivate::Value: 
-        *((QVariant *)*out) = QVariant::fromValue(list->at(val)); 
-        break; 
-    } 
-    return 0; 
-} 
-
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index e9a0449..4ab205e 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -91,14 +91,15 @@ QmlVME::QmlVME()
 
 struct ListInstance
 {
-    ListInstance() {}
-    ListInstance(QList<void *> *q, int t)
-        : type(t), qListInterface(q), qmlListInterface(0) {}
+    ListInstance() 
+        : type(0), qmlListInterface(0) {}
+    ListInstance(int t) 
+        : type(t), qmlListInterface(0) {}
     ListInstance(QmlPrivate::ListInterface *q, int t)
-        : type(t), qListInterface(0), qmlListInterface(q) {}
+        : type(t), qmlListInterface(q) {}
 
     int type;
-    QList<void *> *qListInterface;
+    QmlListProperty<void> qListProperty;
     QmlPrivate::ListInterface *qmlListInterface;
 };
 
@@ -669,7 +670,7 @@ QObject *QmlVME::run(QmlVMEStack<QObject *> &stack, QmlContext *ctxt,
                 QObject *assign = stack.pop();
 
                 const ListInstance &list = qliststack.top();
-                list.qListInterface->append((void *)assign);
+                list.qListProperty.append((QmlListProperty<void>*)&list.qListProperty, assign);
             }
             break;
 
@@ -694,7 +695,7 @@ QObject *QmlVME::run(QmlVMEStack<QObject *> &stack, QmlContext *ctxt,
                     void *d = (void *)&ptr;
                     list.qmlListInterface->append(d);
                 } else {
-                    list.qListInterface->append(ptr);
+                    list.qListProperty.append((QmlListProperty<void>*)&list.qListProperty, ptr);
                 }
             }
             break;
@@ -772,17 +773,12 @@ QObject *QmlVME::run(QmlVMEStack<QObject *> &stack, QmlContext *ctxt,
             {
                 QObject *target = stack.top();
 
+                qliststack.push(ListInstance(instr.fetchQmlList.type));
+
                 void *a[1];
-                // We know that QList<T *>* can be converted to 
-                // QList<void *>*
-                QList<void *> *list = 0;
-                a[0] = &list;
+                a[0] = (void *)&(qliststack.top().qListProperty);
                 QMetaObject::metacall(target, QMetaObject::ReadProperty, 
                                       instr.fetchQmlList.property, a);
-                if (!list) 
-                    VME_EXCEPTION(QCoreApplication::translate("QmlVME","Cannot assign to null list"));
-
-                qliststack.push(ListInstance(list, instr.fetchQmlList.type));
             }
             break;
 
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index ba096b3..2d1d3b9 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -939,10 +939,10 @@ void QmlPropertyAction::setProperties(const QString &p)
 
     \sa exclude matchProperties PropertyAnimation::matchTargets
 */
-QList<QObject *> *QmlPropertyAction::targets()
+QmlListProperty<QObject> QmlPropertyAction::targets()
 {
     Q_D(QmlPropertyAction);
-    return &d->targets;
+    return QmlListProperty<QObject>(this, d->targets);
 }
 
 /*!
@@ -950,10 +950,10 @@ QList<QObject *> *QmlPropertyAction::targets()
     This property holds the objects not to be affected by this animation.
     \sa matchTargets
 */
-QList<QObject *> *QmlPropertyAction::exclude()
+QmlListProperty<QObject> QmlPropertyAction::exclude()
 {
     Q_D(QmlPropertyAction);
-    return &d->exclude;
+    return QmlListProperty<QObject>(this, d->exclude);
 }
 
 /*!
@@ -2089,10 +2089,10 @@ void QmlPropertyAnimation::setProperties(const QString &prop)
     
     \sa exclude matchProperties
 */
-QList<QObject *> *QmlPropertyAnimation::targets()
+QmlListProperty<QObject> QmlPropertyAnimation::targets()
 {
     Q_D(QmlPropertyAnimation);
-    return &d->targets;
+    return QmlListProperty<QObject>(this, d->targets);
 }
 
 /*!
@@ -2100,10 +2100,10 @@ QList<QObject *> *QmlPropertyAnimation::targets()
     This property holds the items not to be affected by this animation.
     \sa matchTargets
 */
-QList<QObject *> *QmlPropertyAnimation::exclude()
+QmlListProperty<QObject> QmlPropertyAnimation::exclude()
 {
     Q_D(QmlPropertyAnimation);
-    return &d->exclude;
+    return QmlListProperty<QObject>(this, d->exclude);
 }
 
 void QmlPropertyAnimationPrivate::valueChanged(qreal r)
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h
index 6a69e4d..a566074 100644
--- a/src/declarative/util/qmlanimation_p.h
+++ b/src/declarative/util/qmlanimation_p.h
@@ -187,8 +187,8 @@ class QmlPropertyAction : public QmlAbstractAnimation
     Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
     Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY targetChanged)
     Q_PROPERTY(QString matchProperties READ properties WRITE setProperties NOTIFY propertiesChanged)
-    Q_PROPERTY(QList<QObject *>* matchTargets READ targets)
-    Q_PROPERTY(QList<QObject *>* exclude READ exclude)
+    Q_PROPERTY(QmlListProperty<QObject> matchTargets READ targets)
+    Q_PROPERTY(QmlListProperty<QObject> exclude READ exclude)
     Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
 
 public:
@@ -204,8 +204,8 @@ public:
     QString properties() const;
     void setProperties(const QString &);
 
-    QList<QObject *> *targets();
-    QList<QObject *> *exclude();
+    QmlListProperty<QObject> targets();
+    QmlListProperty<QObject> exclude();
 
     QVariant value() const;
     void setValue(const QVariant &);
@@ -267,8 +267,8 @@ class Q_AUTOTEST_EXPORT QmlPropertyAnimation : public QmlAbstractAnimation
     Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
     Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY targetChanged)
     Q_PROPERTY(QString matchProperties READ properties WRITE setProperties NOTIFY propertiesChanged)
-    Q_PROPERTY(QList<QObject *>* matchTargets READ targets)
-    Q_PROPERTY(QList<QObject *>* exclude READ exclude)
+    Q_PROPERTY(QmlListProperty<QObject> matchTargets READ targets)
+    Q_PROPERTY(QmlListProperty<QObject> exclude READ exclude)
 
 public:
     QmlPropertyAnimation(QObject *parent=0);
@@ -295,8 +295,8 @@ public:
     QString properties() const;
     void setProperties(const QString &);
 
-    QList<QObject *> *targets();
-    QList<QObject *> *exclude();
+    QmlListProperty<QObject> targets();
+    QmlListProperty<QObject> exclude();
 
 protected:
     virtual void transition(QmlStateActions &actions,
diff --git a/src/declarative/util/qmllistaccessor.cpp b/src/declarative/util/qmllistaccessor.cpp
index 00b8220..e060097 100644
--- a/src/declarative/util/qmllistaccessor.cpp
+++ b/src/declarative/util/qmllistaccessor.cpp
@@ -89,7 +89,7 @@ void QmlListAccessor::setList(const QVariant &v, QmlEngine *engine)
                (enginePrivate && enginePrivate->isQmlList(d.userType()))) {
         m_type = QmlList;
     } else if (QmlMetaType::isList(d.userType())) {
-        m_type = QListPtr;
+        m_type = ListProperty;
     } else {
         m_type = Instance;
     }
@@ -107,10 +107,11 @@ int QmlListAccessor::count() const
             QmlPrivate::ListInterface *li = *(QmlPrivate::ListInterface **)d.constData();
             return li->count();
         }
-    case QListPtr:
+    case ListProperty:
         {
-            QList<void *> *li = *(QList<void *> **)d.constData();
-            return li->count();
+            QmlListProperty<void> *li = (QmlListProperty<void>*)d.constData();
+            if (li->count) return li->count(li);
+            else return 0;
         }
     case Instance:
         return 1;
@@ -137,11 +138,11 @@ QVariant QmlListAccessor::at(int idx) const
             li->at(idx, ptr);
             return QVariant::fromValue((QObject*)ptr[0]);
         }
-    case QListPtr:
+    case ListProperty:
         {
-            QList<void *> *li = *(QList<void *> **)d.constData();
-            void *ptr = li->at(idx);
-            return QVariant::fromValue((QObject*)ptr);
+            QmlListProperty<void> *li = (QmlListProperty<void>*)d.constData();
+            if (li->at) return QVariant::fromValue((QObject *)li->at(li, idx));
+            else return QVariant();
         }
     case Instance:
         return d;
@@ -162,10 +163,10 @@ bool QmlListAccessor::append(const QVariant &value)
             li->append(const_cast<void *>(value.constData()));  //XXX Typesafety
             return true;
         }
-    case QListPtr:
+    case ListProperty:
         {
-            QList<void *> *li = *(QList<void *> **)d.constData();
-            li->append(*reinterpret_cast<void **>(const_cast<void *>(value.constData())));  //XXX Typesafety
+            QmlListProperty<void> *li = (QmlListProperty<void>*)d.constData();
+            if (li->append) li->append(li, *(void **)value.constData()); // XXX Typesafety
             return true;
         }
     case StringList:
@@ -187,10 +188,10 @@ bool QmlListAccessor::insert(int index, const QVariant &value)
             li->insert(index, const_cast<void *>(value.constData()));   //XXX Typesafety
             return true;
         }
-    case QListPtr:
+    case ListProperty:
         {
-            QList<void *> *li = *(QList<void *>**)d.constData();
-            li->insert(index, *reinterpret_cast<void **>(const_cast<void *>(value.constData())));  //XXX Typesafety
+            QmlListProperty<void> *li = (QmlListProperty<void>*)d.constData();
+            if (li->insert) li->insert(li, index, *(void **)value.constData()); // XXX Typesafety
             return true;
         }
     case StringList:
@@ -212,10 +213,10 @@ bool QmlListAccessor::removeAt(int index)
             li->removeAt(index);
             return true;
         }
-    case QListPtr:
+    case ListProperty:
         {
-            QList<void *> *li = *(QList<void *>**)d.constData();
-            li->removeAt(index);
+            QmlListProperty<void> *li = (QmlListProperty<void>*)d.constData();
+            if (li->removeAt) li->removeAt(li, index);
             return true;
         }
     case StringList:
@@ -237,10 +238,10 @@ bool QmlListAccessor::clear()
             li->clear();
             return true;
         }
-    case QListPtr:
+    case ListProperty:
         {
-            QList<void *> *li = *(QList<void *>**)d.constData();
-            li->clear();
+            QmlListProperty<void> *li = (QmlListProperty<void>*)d.constData();
+            if (li->clear) li->clear(li);
             return true;
         }
     case StringList:
diff --git a/src/declarative/util/qmllistaccessor_p.h b/src/declarative/util/qmllistaccessor_p.h
index 3c67e3a..6866150 100644
--- a/src/declarative/util/qmllistaccessor_p.h
+++ b/src/declarative/util/qmllistaccessor_p.h
@@ -70,7 +70,7 @@ public:
     bool removeAt(int);
     bool clear();
 
-    enum Type { Invalid, StringList, VariantList, QmlList, QListPtr, Instance, Integer };
+    enum Type { Invalid, StringList, VariantList, QmlList, ListProperty, Instance, Integer };
     Type type() const { return m_type; }
 
 private:
diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index 0e1837b..ba0a560 100644
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -51,6 +51,9 @@
 #ifdef Q_OS_WIN
 #include <qt_windows.h>
 #endif
+#ifdef Q_OS_WIN32
+#include <QtCore/QVarLengthArray>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -278,53 +281,38 @@ QFileSystemModelPrivate::QFileSystemNode *QFileSystemModelPrivate::node(const QM
     return indexNode;
 }
 
-#ifdef Q_OS_WIN
+#ifdef Q_OS_WIN32
 static QString qt_GetLongPathName(const QString &strShortPath)
 {
-    QString longPath;
-    int i = 0;
-    if (strShortPath == QLatin1String(".")
-        || (strShortPath.startsWith(QLatin1String("//")))
-        || (strShortPath.startsWith(QLatin1String("\\\\")))) // unc
+    if (strShortPath.isEmpty()
+        || strShortPath == QLatin1String(".") || strShortPath == QLatin1String(".."))
         return strShortPath;
-    QString::const_iterator it = strShortPath.constBegin();
-    QString::const_iterator constEnd = strShortPath.constEnd();
-    do {
-        bool isSep = (*it == QLatin1Char('\\') || *it == QLatin1Char('/'));
-        if (isSep || it == constEnd) {
-            QString section = (it == constEnd ? strShortPath : strShortPath.left(i));
-            // FindFirstFile does not handle volumes ("C:"), so we have to catch that ourselves.
-            if (section.endsWith(QLatin1Char(':'))) {
-                longPath.append(section.toUpper());
-            } else {
-                HANDLE h;
-#ifndef Q_OS_WINCE
-                //We add the extend length prefix to handle long path
-                QString longSection = QLatin1String("\\\\?\\")+QDir::toNativeSeparators(section);
-#else
-                QString longSection = QDir::toNativeSeparators(section);
-#endif
-                WIN32_FIND_DATA findData;
-                h = ::FindFirstFile((wchar_t*)longSection.utf16(), &findData);
-                if (h != INVALID_HANDLE_VALUE) {
-                    longPath.append(QString::fromWCharArray(findData.cFileName));
-                    ::FindClose(h);
-                } else {
-                    longPath.append(section);
-                    break;
-                }
-            }
-            if (it != constEnd)
-                longPath.append(*it);
-            else
-                break;
-        }
-        ++it;
-        if (isSep && it == constEnd)    // break out if the last character is a separator
-            break;
-        ++i;
-    } while (true);
-    return longPath;
+    if (strShortPath.length() == 2 && strShortPath.endsWith(QLatin1Char(':')))
+        return strShortPath.toUpper();
+    const QString absPath = QDir(strShortPath).absolutePath();
+    if (absPath.startsWith(QLatin1String("//"))
+        || absPath.startsWith(QLatin1String("\\\\"))) // unc
+        return QDir::fromNativeSeparators(absPath);
+    if (absPath.startsWith(QLatin1Char('/')))
+        return QString();
+    const QString inputString = QLatin1String("\\\\?\\") + QDir::toNativeSeparators(absPath);
+    QVarLengthArray<TCHAR, MAX_PATH> buffer(MAX_PATH);
+    DWORD result = ::GetLongPathName((wchar_t*)inputString.utf16(),
+                                     buffer.data(),
+                                     buffer.size());
+    if (result > DWORD(buffer.size())) {
+        buffer.resize(result);
+        result = ::GetLongPathName((wchar_t*)inputString.utf16(),
+                                   buffer.data(),
+                                   buffer.size());
+    }
+    if (result > 4) {
+        QString longPath = QString::fromWCharArray(buffer.data() + 4); // ignoring prefix
+        longPath[0] = longPath.at(0).toUpper(); // capital drive letters
+        return QDir::fromNativeSeparators(longPath);
+    } else {
+        return QDir::fromNativeSeparators(strShortPath);
+    }
 }
 #endif
 
@@ -342,7 +330,7 @@ QFileSystemModelPrivate::QFileSystemNode *QFileSystemModelPrivate::node(const QS
 
     // Construct the nodes up to the new root path if they need to be built
     QString absolutePath;
-#ifdef Q_OS_WIN
+#ifdef Q_OS_WIN32
     QString longPath = qt_GetLongPathName(path);
 #else
     QString longPath = path;
@@ -1357,7 +1345,11 @@ QModelIndex QFileSystemModel::setRootPath(const QString &newPath)
 {
     Q_D(QFileSystemModel);
 #ifdef Q_OS_WIN
-    QString longNewPath = QDir::fromNativeSeparators(qt_GetLongPathName(newPath));
+#ifdef Q_OS_WIN32
+    QString longNewPath = qt_GetLongPathName(newPath);
+#else
+    QString longNewPath = QDir::fromNativeSeparators(newPath);
+#endif
 #else
     QString longNewPath = newPath;
 #endif
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp
index f87cf28..3f09ebc 100644
--- a/src/gui/styles/qs60style_simulated.cpp
+++ b/src/gui/styles/qs60style_simulated.cpp
@@ -94,12 +94,12 @@ bool saveThemeToBlob(const QString &themeBlob,
         dataOut << color;
     }
 
-    const int picturesCount = partPictures.count();
-    dataOut << picturesCount;
-    foreach (const QString &key, partPictures.keys()) {
-        const QPicture picture = partPictures.value(key);
-        dataOut << key;
-        dataOut << picture;
+    dataOut << partPictures.count();
+    QHashIterator<QString, QPicture> i(partPictures);
+    while (i.hasNext()) {
+        i.next();
+        dataOut << i.key();
+        dataOut << i.value(); // the QPicture
     }
 
     QDataStream blobOut(&blob);
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
index ad33d0b..499eb1d 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
@@ -176,7 +176,7 @@ static inline QWidget *mdiAreaNavigate(QWidget *area,
 
     int minimumDistance = INT_MAX;
     QWidget *target = 0;
-    foreach (QWidget *candidate, candidates.values()) {
+    foreach (QWidget *candidate, candidates) {
         switch (relation) {
         case QAccessible::Up:
         case QAccessible::Down: