diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-26 01:46:17 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-26 01:46:17 (GMT) |
| commit | 9afe3a12515b7c33ebc88832daf15c06f5d30e2c (patch) | |
| tree | ef2dba9212efea1dd5b04243bb2780c73259c404 /src | |
| parent | 8bedba8ecb9cde3de68defea3e2b062504224aa6 (diff) | |
| parent | af6d440e241b9b9127b76a40c4c5ef051cf02401 (diff) | |
| download | Qt-9afe3a12515b7c33ebc88832daf15c06f5d30e2c.zip Qt-9afe3a12515b7c33ebc88832daf15c06f5d30e2c.tar.gz Qt-9afe3a12515b7c33ebc88832daf15c06f5d30e2c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/util/qdeclarativexmllistmodel.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index 7b3d4a8..02bf370 100644 --- a/src/declarative/util/qdeclarativexmllistmodel.cpp +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp @@ -466,8 +466,6 @@ public: QList<QDeclarativeXmlListModelRole *> roleObjects; static void append_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list, QDeclarativeXmlListModelRole *role); static void clear_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list); - static void removeAt_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list, int i); - static void insert_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list, int i, QDeclarativeXmlListModelRole *role); QList<QList<QVariant> > data; int redirectCount; }; |