summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmllistscriptclass_p.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-01-28 05:54:33 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-01-28 05:54:33 (GMT)
commit5f1d7d1e73edd1c2ff3e1ad244100fdbc3495458 (patch)
tree55d084dfdd94a1d1bf7e5732a7eb732b83a3cb30 /src/declarative/qml/qmllistscriptclass_p.h
parent044c93a48213e325f486c3076837a2a7cebbe9aa (diff)
downloadQt-5f1d7d1e73edd1c2ff3e1ad244100fdbc3495458.zip
Qt-5f1d7d1e73edd1c2ff3e1ad244100fdbc3495458.tar.gz
Qt-5f1d7d1e73edd1c2ff3e1ad244100fdbc3495458.tar.bz2
Convert lists to variants on assignment.
QTBUG-5675
Diffstat (limited to 'src/declarative/qml/qmllistscriptclass_p.h')
-rw-r--r--src/declarative/qml/qmllistscriptclass_p.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/qml/qmllistscriptclass_p.h b/src/declarative/qml/qmllistscriptclass_p.h
index 0c6c5b2..e484b34 100644
--- a/src/declarative/qml/qmllistscriptclass_p.h
+++ b/src/declarative/qml/qmllistscriptclass_p.h
@@ -64,13 +64,14 @@ public:
QmlListScriptClass(QmlEngine *);
~QmlListScriptClass();
- enum ListType { QListPtr, QmlListPtr };
- QScriptValue newList(QObject *, int, ListType);
+ enum ListCategory { QListPtr, QmlListPtr };
+ QScriptValue newList(QObject *, int, ListCategory, int);
protected:
virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &,
QScriptClass::QueryFlags flags);
virtual ScriptValue property(Object *, const Identifier &);
+ virtual QVariant toVariant(Object *, bool *ok);
private:
PersistentIdentifier m_lengthId;