diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-08-22 13:15:52 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-24 10:11:29 +0200 |
| commit | e6c0633a9c386817017a97dac9e541a45f42fd7f (patch) | |
| tree | 266e0a6ed2b31157c3eb5aaf26d80196b8a69dd7 /src/declarative/qml/v8/qv8engine_p.h | |
| parent | ff7bd14ec74b76c277bcd66026c42bfe209f0af6 (diff) | |
Fix tst_qjsvalue::castToPointer test failure
In order for casting the variant's data() to work,
we need to get at the actual QVariant wrapped in
the JS object; copying the variant caused a stale
pointer to be returned.
Task-number: QTBUG-21000
Change-Id: I1a32a70d5a043c94dbbd07ef2c8048e7df7fc7bf
Reviewed-on: http://codereview.qt.nokia.com/3309
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src/declarative/qml/v8/qv8engine_p.h')
| -rw-r--r-- | src/declarative/qml/v8/qv8engine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/v8/qv8engine_p.h b/src/declarative/qml/v8/qv8engine_p.h index f20d867a81..43ef9821ac 100644 --- a/src/declarative/qml/v8/qv8engine_p.h +++ b/src/declarative/qml/v8/qv8engine_p.h @@ -387,7 +387,7 @@ public: const QByteArray &targetType, void **result); - QVariant variantValue(v8::Handle<v8::Value> value); + QVariant &variantValue(v8::Handle<v8::Value> value); QJSValue scriptValueFromInternal(v8::Handle<v8::Value>) const; |