diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-30 09:09:51 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-16 01:26:12 +0200 |
| commit | 82a3fef9104ef449ecae56a2b228f4e820d928fa (patch) | |
| tree | 4c87df2570d47f652589f8e2d787ae67a861772b /src/qml/qml/v4/qv4instruction_p.h | |
| parent | f189b8934dc405cbd45258abc5aba2713428b1cc (diff) | |
Add support for variant properties in V4
Support initialization of variant properties in V4. Variants can
be set to contain basic types in V4, but we can't extract data from
them since they may contain data types that V4 does not comprehend.
Task-number: QTBUG-25022
Change-Id: I1935d77b50c5a3481c4c8ddd86b9d3d970571217
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/qml/qml/v4/qv4instruction_p.h b/src/qml/qml/v4/qv4instruction_p.h index 310bfbaff5..6eb9efa50f 100644 --- a/src/qml/qml/v4/qv4instruction_p.h +++ b/src/qml/qml/v4/qv4instruction_p.h @@ -83,23 +83,31 @@ QT_BEGIN_NAMESPACE F(ConvertBoolToInt, unaryop) \ F(ConvertBoolToNumber, unaryop) \ F(ConvertBoolToString, unaryop) \ + F(ConvertBoolToVariant, unaryop) \ F(ConvertIntToBool, unaryop) \ F(ConvertIntToNumber, unaryop) \ F(ConvertIntToString, unaryop) \ + F(ConvertIntToVariant, unaryop) \ F(ConvertNumberToBool, unaryop) \ F(ConvertNumberToInt, unaryop) \ F(ConvertNumberToString, unaryop) \ + F(ConvertNumberToVariant, unaryop) \ F(ConvertStringToBool, unaryop) \ F(ConvertStringToInt, unaryop) \ F(ConvertStringToNumber, unaryop) \ F(ConvertStringToUrl, unaryop) \ F(ConvertStringToColor, unaryop) \ + F(ConvertStringToVariant, unaryop) \ F(ConvertUrlToBool, unaryop) \ F(ConvertUrlToString, unaryop) \ + F(ConvertUrlToVariant, unaryop) \ F(ConvertColorToBool, unaryop) \ F(ConvertColorToString, unaryop) \ + F(ConvertColorToVariant, unaryop) \ F(ConvertObjectToBool, unaryop) \ + F(ConvertObjectToVariant, unaryop) \ F(ConvertNullToObject, unaryop) \ + F(ConvertNullToVariant, unaryop) \ F(ResolveUrl, unaryop) \ F(MathSinNumber, unaryop) \ F(MathCosNumber, unaryop) \ |