diff options
| author | Simon Hausmann <[email protected]> | 2014-02-04 10:21:33 +0100 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2014-02-04 18:29:04 +0100 |
| commit | 50269fc37a6a50864bf08b25327a05f2ab885a1a (patch) | |
| tree | e04689e2afc058c404b70dbf0ccc4266df36664a /src/qml/compiler/qv4compileddata_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 <[email protected]>
Diffstat (limited to 'src/qml/compiler/qv4compileddata_p.h')
| -rw-r--r-- | src/qml/compiler/qv4compileddata_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h index edb1737648..94ea4bdc90 100644 --- a/src/qml/compiler/qv4compileddata_p.h +++ b/src/qml/compiler/qv4compileddata_p.h @@ -302,7 +302,8 @@ struct Q_QML_EXPORT Binding IsOnAssignment = 0x4, InitializerForReadOnlyDeclaration = 0x8, IsResolvedEnum = 0x10, - IsListItem = 0x20 + IsListItem = 0x20, + IsBindingToAlias = 0x40 }; quint32 flags : 16; @@ -329,6 +330,9 @@ struct Q_QML_EXPORT Binding return true; } + bool isValueBindingNoAlias() const { return isValueBinding() && !(flags & IsBindingToAlias); } + bool isValueBindingToAlias() const { return isValueBinding() && (flags & IsBindingToAlias); } + bool isSignalHandler() const { if (flags & IsSignalHandlerExpression || flags & IsSignalHandlerObject) { |