diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-03-13 16:24:49 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 05:37:59 +0100 |
| commit | 89c57d2859a2bb2d64f876b3458e090eb6f77b8b (patch) | |
| tree | 4ea0bb2cd1f108a4be09d4e861ed608021e20811 /src/qml/qml/v4/qv4instruction_p.h | |
| parent | 47e0817973ed4e992d8cb537c49bdaa3c4fc2168 (diff) | |
Support null -> QObject and QObject -> bool conversions in v4.
Change-Id: I66602bf52986a388f9b6fe2bcd4630b862138906
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/qml/qml/v4/qv4instruction_p.h')
| -rw-r--r-- | src/qml/qml/v4/qv4instruction_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/v4/qv4instruction_p.h b/src/qml/qml/v4/qv4instruction_p.h index d6c790e46f..239cb362cc 100644 --- a/src/qml/qml/v4/qv4instruction_p.h +++ b/src/qml/qml/v4/qv4instruction_p.h @@ -98,6 +98,8 @@ QT_BEGIN_NAMESPACE F(ConvertUrlToString, unaryop) \ F(ConvertColorToBool, unaryop) \ F(ConvertColorToString, unaryop) \ + F(ConvertObjectToBool, unaryop) \ + F(ConvertNullToObject, unaryop) \ F(ResolveUrl, unaryop) \ F(MathSinReal, unaryop) \ F(MathCosReal, unaryop) \ |