diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-04-23 09:33:25 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-04-23 09:34:29 +0200 |
| commit | 580fa7dc88aae23053e44ffa335a15f6af112a20 (patch) | |
| tree | 5bc915d7c2e252739122d9441bd0d7fa7175d0c2 /src/qml/jit/qv4operation_p.h | |
| parent | 6767114285db9d0e16dc278d08f231e8561546b4 (diff) | |
| parent | c00283bb3bb966bf60c307ec8283bd98c12318bf (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ifec879473540b609403ac951967f6d9ecb0bb6f0
Diffstat (limited to 'src/qml/jit/qv4operation_p.h')
| -rw-r--r-- | src/qml/jit/qv4operation_p.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/qml/jit/qv4operation_p.h b/src/qml/jit/qv4operation_p.h index 8b66e58d4b..43214023e8 100644 --- a/src/qml/jit/qv4operation_p.h +++ b/src/qml/jit/qv4operation_p.h @@ -123,12 +123,10 @@ enum OpKind: uint16_t { JSDeleteName, JSIn, JSInstanceOf, - /* ok, these are qml object ops, but we don't care for now and treat them a s JS */ - QMLLoadScopeObjectProperty, - QMLStoreScopeObjectProperty, - QMLLoadContextObjectProperty, - QMLStoreContextObjectProperty, - QMLLoadIdObject, + + /* ok, these are qml object ops, but we don't care for now and treat them as JS */ + QMLLoadQmlContextPropertyLookup, + QMLCallQmlContextPropertyLookup, JSEqual, JSGreaterThan, @@ -168,16 +166,11 @@ enum OpKind: uint16_t { JSCreateClass, JSConstruct, JSConstructWithSpread, - /* ok, these are qml vararg calls, but we don't care for now and treat them as JS */ - QMLCallScopeObjectProperty, - QMLCallContextObjectProperty, JSTypeofName, JSTypeofValue, JSDeclareVar, JSDestructureRestElement, - QMLLoadContext, - QMLLoadImportedScripts, JSThisToObject, JSCreateMappedArgumentsObject, JSCreateUnmappedArgumentsObject, |