diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2012-03-29 15:15:23 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-30 07:54:14 +0200 |
| commit | bb5afc485d68b2ef779f858d461160c0634c3020 (patch) | |
| tree | 10bc5eb7bb78db91d9ba64b1f301a09a633ad615 /src/qml/qml/v4/qv4compiler.cpp | |
| parent | d2447feece42859011d7995dff5614f3d1758e64 (diff) | |
Fix crash in QUrl-to-int conversion in v4
Also adds various unit tests for other conversion operations.
Note that many of the conversion operations produce the wrong results,
and have been marked with QTBUG-24706.
Task-number: QTBUG-24706
Change-Id: Id96a7409e31f2e889dce6b501247f58b59fa6a98
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/qml/qml/v4/qv4compiler.cpp')
| -rw-r--r-- | src/qml/qml/v4/qv4compiler.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/qml/v4/qv4compiler.cpp b/src/qml/qml/v4/qv4compiler.cpp index 9354209643..ba7c2edc79 100644 --- a/src/qml/qml/v4/qv4compiler.cpp +++ b/src/qml/qml/v4/qv4compiler.cpp @@ -940,10 +940,9 @@ void QV4CompilerPrivate::visitMove(IR::Move *s) // generate a UrlToString conversion and fix // the type of the source expression. V4Instr conv; - conv.unaryop.output = V4Instr::ConvertUrlToString; + conv.unaryop.output = src; conv.unaryop.src = src; - gen(opcode, conv); - + gen(V4Instr::ConvertUrlToString, conv); sourceTy = IR::StringType; break; } |