diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-16 12:17:01 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 14:26:27 +0200 |
| commit | 21a7409446ba43066c7c8209edc37cf5b9a7bb94 (patch) | |
| tree | 780192b46370fe6f82f2cae048a3f7d2d40ad1ba /src/qml/qml/qqmlobjectcreator_p.h | |
| parent | d071acf7ff4573cdf7dbea801f40375611243551 (diff) | |
[new compiler] Implement remaining literal binding value assignments
Ported over the code from genLiteralAssignment and testLiteralAssignment
to converting the AST type (string, bool, number) to the expected property
meta-type.
Change-Id: I709b97efdd741dbc4217ee0b9712de58dd32b82d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator_p.h')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h index 3a3ea9251d..3bfa006a6d 100644 --- a/src/qml/qml/qqmlobjectcreator_p.h +++ b/src/qml/qml/qqmlobjectcreator_p.h @@ -96,10 +96,9 @@ private: void populateInstance(int index, QObject *instance, QQmlRefPointer<QQmlPropertyCache> cache); QVector<QQmlAbstractBinding *> setupBindings(QV4::ExecutionContext *qmlContext); + void setPropertyValue(QQmlPropertyData *property, const QV4::CompiledData::Binding *binding); void setupFunctions(QV4::ExecutionContext *qmlContext); - QVariant variantForBinding(int expectedMetaType, const QV4::CompiledData::Binding *binding) const; - QString stringAt(int idx) const { return unit->header.stringAt(idx); } void recordError(const QV4::CompiledData::Location &location, const QString &description); @@ -117,6 +116,7 @@ private: const QV4::CompiledData::Object *_compiledObject; QQmlData *_ddata; QQmlRefPointer<QQmlPropertyCache> _propertyCache; + QQmlVMEMetaObject *_vmeMetaObject; }; QT_END_NAMESPACE |