diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-04-04 17:26:22 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-25 11:51:20 +0200 |
commit | 6759ea52fa636505eda925907a15b3ef243c20c6 (patch) | |
tree | 0d46b075e0ac988d775db982b8a01bac35b78170 /src/qml/qml/v8 | |
parent | d00fbd043e53913bc64148f3207571d85f661a30 (diff) |
Add an v8 object template for visual data model change sets.
This is more optimal than dynamically creating an object per
change for each signal emission. Also create static string
instances for property names common to all item objects.
Change-Id: I8b0a6b683df4ee9c55c15cc928603e82f37045f7
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml/v8')
-rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 1 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8engine_p.h | 1 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8objectresource_p.h | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 4e53964086..85a2f1b379 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -249,6 +249,7 @@ QVariant QV8Engine::toVariant(v8::Handle<v8::Value> value, int typeHint) case QV8ObjectResource::Context2DType: case QV8ObjectResource::ParticleDataType: case QV8ObjectResource::LocaleDataType: + case QV8ObjectResource::ChangeSetArrayType: return QVariant(); case QV8ObjectResource::TypeType: return m_typeWrapper.toVariant(r); diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h index 0cd54ae3a1..649edcdbb2 100644 --- a/src/qml/qml/v8/qv8engine_p.h +++ b/src/qml/qml/v8/qv8engine_p.h @@ -126,7 +126,6 @@ QT_BEGIN_NAMESPACE return rv; \ } \ - template<class T> inline T *v8_resource_cast(v8::Handle<v8::Object> object) { QV8ObjectResource *resource = static_cast<QV8ObjectResource *>(object->GetExternalResource()); diff --git a/src/qml/qml/v8/qv8objectresource_p.h b/src/qml/qml/v8/qv8objectresource_p.h index c37905a0b8..919f2a9d3f 100644 --- a/src/qml/qml/v8/qv8objectresource_p.h +++ b/src/qml/qml/v8/qv8objectresource_p.h @@ -73,7 +73,7 @@ public: ValueTypeType, XMLHttpRequestType, DOMNodeType, SQLDatabaseType, ListModelType, Context2DType, Context2DStyleType, Context2DPixelArrayType, ParticleDataType, SignalHandlerType, IncubatorType, VisualDataItemType, - SequenceType, LocaleDataType }; + SequenceType, LocaleDataType, ChangeSetArrayType }; virtual ResourceType resourceType() const = 0; QV8Engine *engine; |