diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-13 15:06:40 +1000 |
|---|---|---|
| committer | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-13 15:22:14 +1000 |
| commit | 784555f3032194a8923d804a8ce84957f113caf6 (patch) | |
| tree | 6b538cea5bf82bd5288ac180125abd1bb312ddad /src/qml/qml/v4/qv4instruction_p.h | |
| parent | 1f52c5430144eb7ba6baa7e3954675ca0707b947 (diff) | |
| parent | 648c80c4c0759efb6e35fac7acc8daad5aab13e2 (diff) | |
Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into merge-master
Change-Id: Iaefec13503dadfa200539b8de7a2d80fc5bb3bcf
Diffstat (limited to 'src/qml/qml/v4/qv4instruction_p.h')
| -rw-r--r-- | src/qml/qml/v4/qv4instruction_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/qml/v4/qv4instruction_p.h b/src/qml/qml/v4/qv4instruction_p.h index 964c95513f..9727c23959 100644 --- a/src/qml/qml/v4/qv4instruction_p.h +++ b/src/qml/qml/v4/qv4instruction_p.h @@ -100,8 +100,10 @@ QT_BEGIN_NAMESPACE F(ResolveUrl, unaryop) \ F(MathSinReal, unaryop) \ F(MathCosReal, unaryop) \ + F(MathAbsReal, unaryop) \ F(MathRoundReal, unaryop) \ F(MathFloorReal, unaryop) \ + F(MathCeilReal, unaryop) \ F(MathPIReal, unaryop) \ F(LoadReal, real_value) \ F(LoadInt, int_value) \ @@ -137,6 +139,8 @@ QT_BEGIN_NAMESPACE F(NotEqualString, binaryop) \ F(StrictEqualString, binaryop) \ F(StrictNotEqualString, binaryop) \ + F(MathMaxReal, binaryop) \ + F(MathMinReal, binaryop) \ F(NewString, construct) \ F(NewUrl, construct) \ F(CleanupRegister, cleanup) \ |