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_p.h | |
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_p.h')
-rw-r--r-- | src/script/api/qscriptengine_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h index 4fb22f0..b36787b 100644 --- a/src/script/api/qscriptengine_p.h +++ b/src/script/api/qscriptengine_p.h @@ -316,7 +316,7 @@ inline JSC::JSValue QScriptEnginePrivate::scriptValueToJSCValue(const QScriptVal QScriptValuePrivate *vv = QScriptValuePrivate::get(value); if (!vv) return JSC::JSValue(); - if (vv->type != QScriptValuePrivate::JSC) { + if (vv->type != QScriptValuePrivate::JavaScriptCore) { Q_ASSERT(!vv->engine || vv->engine == this); vv->engine = this; if (vv->type == QScriptValuePrivate::Number) { @@ -340,7 +340,7 @@ inline void QScriptValuePrivate::initFrom(JSC::JSValue value) Q_ASSERT(engine != 0); value = engine->toUsableValue(value); } - type = JSC; + type = JavaScriptCore; jscValue = value; if (engine) engine->registerScriptValue(this); |