diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-13 23:23:50 (GMT) |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-13 23:23:50 (GMT) |
| commit | 1bcb6aead8dcb482b56147b1f0af4440b1008d1c (patch) | |
| tree | 0a3f221d7bfe91bcf7a5333dac22f26703d20460 /src/script/api/qscriptengine.cpp | |
| parent | 9e43002b7d7319c143c97b707e095fef434d0af2 (diff) | |
| parent | f393ae6dd4cc8e40c5b97c18efe7862253bc2bdd (diff) | |
| download | Qt-1bcb6aead8dcb482b56147b1f0af4440b1008d1c.zip Qt-1bcb6aead8dcb482b56147b1f0af4440b1008d1c.tar.gz Qt-1bcb6aead8dcb482b56147b1f0af4440b1008d1c.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); |