diff options
| author | Iain <qt-info@nokia.com> | 2009-09-11 09:49:23 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-09-11 09:49:23 (GMT) |
| commit | 04fc98f2ed323c71a8671542f4f37faa988c434f (patch) | |
| tree | 11a5dc618d6dfc27d8aafe3bf3a28981325a7304 /src/script/api/qscriptengine.cpp | |
| parent | 3d4a2cd013f9e62788adf902a57ae8e2f31fccc7 (diff) | |
| parent | 92789fabd6728820b244d23d7477f2a224a33f94 (diff) | |
| download | Qt-04fc98f2ed323c71a8671542f4f37faa988c434f.zip Qt-04fc98f2ed323c71a8671542f4f37faa988c434f.tar.gz Qt-04fc98f2ed323c71a8671542f4f37faa988c434f.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
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 087e49c..e39e1d1 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -890,7 +890,7 @@ JSC::JSValue QScriptEnginePrivate::jscValueFromVariant(const QVariant &v) QScriptValue vv = scriptValueFromVariant(v); QScriptValuePrivate *p = QScriptValuePrivate::get(vv); switch (p->type) { - case QScriptValuePrivate::JSC: + case QScriptValuePrivate::JavaScriptCore: return p->jscValue; case QScriptValuePrivate::Number: return JSC::jsNumber(currentFrame, p->numberValue); |