diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:24 +1000 |
|---|---|---|
| committer | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:54 +1000 |
| commit | 0284817d6cd7e17afa8da26ee6e9199100754446 (patch) | |
| tree | c351d55d5a606c81c72e481f846b9b9e2603c883 /src/qml/qml/v4/qv4instruction_p.h | |
| parent | 377eb94eb19dafeca20d12bc6b624f1779fae514 (diff) | |
| parent | 36bd7f616f37f5f60e59bce1f0d8970248d627de (diff) | |
Merge master <-> api_changes
Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
Diffstat (limited to 'src/qml/qml/v4/qv4instruction_p.h')
| -rw-r--r-- | src/qml/qml/v4/qv4instruction_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/qml/v4/qv4instruction_p.h b/src/qml/qml/v4/qv4instruction_p.h index 8150eedf54..964c95513f 100644 --- a/src/qml/qml/v4/qv4instruction_p.h +++ b/src/qml/qml/v4/qv4instruction_p.h @@ -92,8 +92,11 @@ QT_BEGIN_NAMESPACE F(ConvertStringToInt, unaryop) \ F(ConvertStringToReal, unaryop) \ F(ConvertStringToUrl, unaryop) \ + F(ConvertStringToColor, unaryop) \ F(ConvertUrlToBool, unaryop) \ F(ConvertUrlToString, unaryop) \ + F(ConvertColorToBool, unaryop) \ + F(ConvertColorToString, unaryop) \ F(ResolveUrl, unaryop) \ F(MathSinReal, unaryop) \ F(MathCosReal, unaryop) \ |