diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-10 14:51:00 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-17 08:10:07 +0100 |
commit | 4005c0e29cea1bbcb35c480866418ba01f019756 (patch) | |
tree | 80dcf657f787f40bb60be56d7bc4cd90ef749c70 /src/quick/util/qquickpropertychanges.cpp | |
parent | 97c21311a1de5bca7b97a0a1ae81bb651afa41c8 (diff) |
[new compiler] Initial support for QQuick state changes
This requires the use of the customer parser together with lazy binding compilation
Change-Id: I45d8a206267d3e0c807771a79645168254be9c95
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/quick/util/qquickpropertychanges.cpp')
-rw-r--r-- | src/quick/util/qquickpropertychanges.cpp | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp index 148c55bbcb..55ac85e64d 100644 --- a/src/quick/util/qquickpropertychanges.cpp +++ b/src/quick/util/qquickpropertychanges.cpp @@ -259,6 +259,29 @@ QQuickPropertyChangesParser::compileList(QList<QPair<QString, QVariant> > &list, } } +void QQuickPropertyChangesParser::compileList(QList<QPair<QString, const QV4::CompiledData::Binding*> > &list, const QString &pre, const QV4::CompiledData::QmlUnit *qmlUnit, const QV4::CompiledData::Binding *binding) +{ + QString propName = pre + qmlUnit->header.stringAt(binding->propertyNameIndex); + + if (binding->type == QV4::CompiledData::Binding::Type_Object) { + error(qmlUnit->objectAt(binding->value.objectIndex), QQuickPropertyChanges::tr("PropertyChanges does not support creating state-specific objects.")); + return; + } + + if (binding->type == QV4::CompiledData::Binding::Type_GroupProperty + || binding->type == QV4::CompiledData::Binding::Type_AttachedProperty) { + QString pre = propName + QLatin1Char('.'); + const QV4::CompiledData::Object *subObj = qmlUnit->objectAt(binding->value.objectIndex); + const QV4::CompiledData::Binding *subBinding = subObj->bindingTable(); + for (quint32 i = 0; i < subObj->nBindings; ++i, ++subBinding) { + compileList(list, pre, qmlUnit, subBinding); + } + return; + } + + list << qMakePair(propName, binding); +} + QByteArray QQuickPropertyChangesParser::compile(const QList<QQmlCustomParserProperty> &props) { @@ -303,6 +326,44 @@ QQuickPropertyChangesParser::compile(const QList<QQmlCustomParserProperty> &prop return rv; } +QByteArray QQuickPropertyChangesParser::compile(const QV4::CompiledData::QmlUnit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &props) +{ + QList<QPair<QString, const QV4::CompiledData::Binding *> > data; + for (int ii = 0; ii < props.count(); ++ii) + compileList(data, QString(), qmlUnit, props.at(ii)); + + QByteArray rv; + QDataStream ds(&rv, QIODevice::WriteOnly); + + ds << data.count(); + for (int ii = 0; ii < data.count(); ++ii) { + const QV4::CompiledData::Binding *binding = data.at(ii).second; + QVariant var; + bool isScript = binding->type == QV4::CompiledData::Binding::Type_Script; + QQmlBinding::Identifier id = QQmlBinding::Invalid; + switch (binding->type) { + case QV4::CompiledData::Binding::Type_Script: + // ### pre-compile binding + case QV4::CompiledData::Binding::Type_String: + var = binding->valueAsString(&qmlUnit->header); + break; + case QV4::CompiledData::Binding::Type_Number: + var = binding->valueAsNumber(); + break; + case QV4::CompiledData::Binding::Type_Boolean: + var = binding->valueAsBoolean(); + break; + default: + break; + } + ds << data.at(ii).first << isScript << var; + if (isScript) + ds << id; + } + + return rv; +} + void QQuickPropertyChangesPrivate::decode() { Q_Q(QQuickPropertyChanges); |