diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-07-20 13:46:52 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-28 11:27:26 +0200 |
commit | 0511dfc0b8851baf84df73780e770f1025261068 (patch) | |
tree | 65a9acb210ff5197c2c3f11edac594a124bfc206 /src/declarative/qml | |
parent | 8fda8d16df9744b69a97020e3aae1ad40ff1f538 (diff) |
Initial CustomEmitter and CustomAffector implementation
Currently basic and can't access all properties.
Change-Id: I66efc235112cffcf1a3ca5cc69099a5d09ec7691
Reviewed-on: http://codereview.qt.nokia.com/1950
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/qml')
-rw-r--r-- | src/declarative/qml/v8/qv8engine.cpp | 1 | ||||
-rw-r--r-- | src/declarative/qml/v8/qv8engine_p.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/v8/qv8engine.cpp b/src/declarative/qml/v8/qv8engine.cpp index 2dd52b0ac3..056924291e 100644 --- a/src/declarative/qml/v8/qv8engine.cpp +++ b/src/declarative/qml/v8/qv8engine.cpp @@ -188,6 +188,7 @@ QVariant QV8Engine::toVariant(v8::Handle<v8::Value> value, int typeHint) case QV8ObjectResource::SQLDatabaseType: case QV8ObjectResource::ListModelType: case QV8ObjectResource::Context2DType: + case QV8ObjectResource::ParticleDataType: return QVariant(); case QV8ObjectResource::QObjectType: return qVariantFromValue<QObject *>(m_qobjectWrapper.toQObject(r)); diff --git a/src/declarative/qml/v8/qv8engine_p.h b/src/declarative/qml/v8/qv8engine_p.h index d9f4feeb86..5058eee59f 100644 --- a/src/declarative/qml/v8/qv8engine_p.h +++ b/src/declarative/qml/v8/qv8engine_p.h @@ -125,7 +125,7 @@ public: QV8ObjectResource(QV8Engine *engine) : engine(engine) { Q_ASSERT(engine); } enum ResourceType { ContextType, QObjectType, TypeType, ListType, VariantType, ValueTypeType, XMLHttpRequestType, DOMNodeType, SQLDatabaseType, - ListModelType, Context2DType }; + ListModelType, Context2DType, ParticleDataType }; virtual ResourceType resourceType() const = 0; QV8Engine *engine; |