diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-04 10:21:33 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-04 18:29:04 +0100 |
| commit | 50269fc37a6a50864bf08b25327a05f2ab885a1a (patch) | |
| tree | e04689e2afc058c404b70dbf0ccc4266df36664a /src/qml/compiler/qqmltypecompiler_p.h | |
| parent | 63b8285a2d528be82015133bd72a91c17c3a460b (diff) | |
[new compiler] Fix order of alias vs non-alias bindings
qqmlecmascript's alias binding tests expect bindings on non-aliases to be bound
before bindings on aliases, as the latter may override parts of the former.
Change-Id: I23d25c2b7a449f0ed4672ef6865c4a7ef0ed0129
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qqmltypecompiler_p.h')
| -rw-r--r-- | src/qml/compiler/qqmltypecompiler_p.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/qml/compiler/qqmltypecompiler_p.h b/src/qml/compiler/qqmltypecompiler_p.h index 51ac36667e..2e97d13481 100644 --- a/src/qml/compiler/qqmltypecompiler_p.h +++ b/src/qml/compiler/qqmltypecompiler_p.h @@ -163,6 +163,18 @@ private: QHash<int, QQmlCompiledData::TypeReference *> *resolvedTypes; }; +// Annotate properties bound to aliases with a flag +class QQmlAliasAnnotator : public QQmlCompilePass +{ +public: + QQmlAliasAnnotator(QQmlTypeCompiler *typeCompiler); + + void annotateBindingsToAliases(); +private: + const QList<QtQml::QmlObject*> &qmlObjects; + const QVector<QQmlPropertyCache *> propertyCaches; +}; + class QQmlComponentAndAliasResolver : public QQmlCompilePass { Q_DECLARE_TR_FUNCTIONS(QQmlAnonymousComponentResolver) |