diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:29:32 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:37:03 +0100 |
| commit | 4821058f10118be55a541ad39e25ec9165cca3b3 (patch) | |
| tree | 167973e3c68fc442b0e37d6f628f3fdbe759f15a /src/qml/qml/v4/qv4instruction_p.h | |
| parent | 83f11e33745180e9370d484cbcedd0bac020c9dd (diff) | |
| parent | 26d5f2e833f0e3686aaa27e695bbfab5fbd808ad (diff) | |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
Diffstat (limited to 'src/qml/qml/v4/qv4instruction_p.h')
| -rw-r--r-- | src/qml/qml/v4/qv4instruction_p.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/qml/qml/v4/qv4instruction_p.h b/src/qml/qml/v4/qv4instruction_p.h index 9727c23959..d6c790e46f 100644 --- a/src/qml/qml/v4/qv4instruction_p.h +++ b/src/qml/qml/v4/qv4instruction_p.h @@ -73,6 +73,7 @@ QT_BEGIN_NAMESPACE F(LoadId, load) \ F(LoadScope, load) \ F(LoadRoot, load) \ + F(LoadModuleObject, load) \ F(LoadAttached, attached) \ F(UnaryNot, unaryop) \ F(UnaryMinusReal, unaryop) \ @@ -105,6 +106,7 @@ QT_BEGIN_NAMESPACE F(MathFloorReal, unaryop) \ F(MathCeilReal, unaryop) \ F(MathPIReal, unaryop) \ + F(LoadNull, null_value) \ F(LoadReal, real_value) \ F(LoadInt, int_value) \ F(LoadBool, bool_value) \ @@ -139,6 +141,10 @@ QT_BEGIN_NAMESPACE F(NotEqualString, binaryop) \ F(StrictEqualString, binaryop) \ F(StrictNotEqualString, binaryop) \ + F(EqualObject, binaryop) \ + F(NotEqualObject, binaryop) \ + F(StrictEqualObject, binaryop) \ + F(StrictNotEqualObject, binaryop) \ F(MathMaxReal, binaryop) \ F(MathMinReal, binaryop) \ F(NewString, construct) \ @@ -270,6 +276,11 @@ union V4Instr { qint8 reg; }; + struct instr_null_value { + QML_V4_INSTR_HEADER + qint8 reg; + }; + struct instr_real_value { QML_V4_INSTR_HEADER qint8 reg; @@ -357,6 +368,7 @@ union V4Instr { instr_fetch fetch; instr_copy copy; instr_construct construct; + instr_null_value null_value; instr_real_value real_value; instr_int_value int_value; instr_bool_value bool_value; |