diff options
| author | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2010-04-29 14:25:20 (GMT) |
|---|---|---|
| committer | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2010-04-30 07:59:27 (GMT) |
| commit | 20143e765b627ba2f8ab77ea9b842dd1549f19f3 (patch) | |
| tree | 76e3506ee3ef6a6474bbb5f242744c6ed57c66ef /src/script/api/qscriptengine.cpp | |
| parent | 498786a2ab27680b27f8e57b422ff8f32f0c3790 (diff) | |
| download | Qt-20143e765b627ba2f8ab77ea9b842dd1549f19f3.zip Qt-20143e765b627ba2f8ab77ea9b842dd1549f19f3.tar.gz Qt-20143e765b627ba2f8ab77ea9b842dd1549f19f3.tar.bz2 | |
Fix conversion between QVariant and QScriptValue.
Function converting from QVariant to QScriptValue is smart and tries
to unwrap a value. So QVariant(1234) after conversion will be equal
to QScriptValue(1234). It is ok, but QVariant(QVariant(...)) should be
unpacked only once.
Reviewed-by: Kent Hansen
Task-number: QTBUG-10315
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 03d535c..014889b 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -2983,7 +2983,7 @@ JSC::JSValue QScriptEnginePrivate::create(JSC::ExecState *exec, int type, const break; #endif case QMetaType::QVariant: - result = jscValueFromVariant(exec, *reinterpret_cast<const QVariant*>(ptr)); + result = eng->newVariant(*reinterpret_cast<const QVariant*>(ptr)); break; default: if (type == qMetaTypeId<QScriptValue>()) { |