diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-10 14:41:08 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-10 14:42:04 (GMT) |
| commit | 62f5eac56ddc0ffc4e3ef812c6b593c1d16298bb (patch) | |
| tree | ddaa1145f23d6f1298eff3eae89764adeb21781a /src/script/api/qscriptengine.cpp | |
| parent | a21b661384c31e6c9154a99690b2d134a12b9187 (diff) | |
| download | Qt-62f5eac56ddc0ffc4e3ef812c6b593c1d16298bb.zip Qt-62f5eac56ddc0ffc4e3ef812c6b593c1d16298bb.tar.gz Qt-62f5eac56ddc0ffc4e3ef812c6b593c1d16298bb.tar.bz2 | |
Fix compilation with winscw
Winscw gets very confused when the name of an enum value is the same as
the name of an entire namespace, JSC in this case. Renaming the enum
value to JavaScriptCore fixes this.
Rubber-stamped-by: Kent
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); |