diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-30 13:49:21 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-30 13:49:21 (GMT) |
| commit | 00f7426f3906361fb5addb36e428648eee5e2983 (patch) | |
| tree | c299b0f6f323ea2f37161cfdf5b2fb33bbe35673 /src/script | |
| parent | 429b747d492ef038c2ed58a9a72060d951721252 (diff) | |
| parent | ae305abfdb795b472b2b9d200bf3b11af00d7d1f (diff) | |
| download | Qt-00f7426f3906361fb5addb36e428648eee5e2983.zip Qt-00f7426f3906361fb5addb36e428648eee5e2983.tar.gz Qt-00f7426f3906361fb5addb36e428648eee5e2983.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.7
Conflicts:
src/3rdparty/phonon/ds9/iodevicereader.cpp
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/bridge/qscriptdeclarativeclass.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/script/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp index acfb2a4..0f450ca 100644 --- a/src/script/bridge/qscriptdeclarativeclass.cpp +++ b/src/script/bridge/qscriptdeclarativeclass.cpp @@ -70,9 +70,12 @@ QScriptDeclarativeClass::Value::Value(QScriptContext *ctxt, uint value) new (this) JSC::JSValue(QScriptEnginePrivate::frameForContext(ctxt), value); } -QScriptDeclarativeClass::Value::Value(QScriptContext *ctxt, bool value) +QScriptDeclarativeClass::Value::Value(QScriptContext *, bool value) { - new (this) JSC::JSValue(QScriptEnginePrivate::frameForContext(ctxt), value); + if (value) + new (this) JSC::JSValue(JSC::JSValue::JSTrue); + else + new (this) JSC::JSValue(JSC::JSValue::JSFalse); } QScriptDeclarativeClass::Value::Value(QScriptContext *ctxt, double value) @@ -107,7 +110,10 @@ QScriptDeclarativeClass::Value::Value(QScriptEngine *eng, uint value) QScriptDeclarativeClass::Value::Value(QScriptEngine *eng, bool value) { - new (this) JSC::JSValue(QScriptEnginePrivate::get(eng)->currentFrame, value); + if (value) + new (this) JSC::JSValue(JSC::JSValue::JSTrue); + else + new (this) JSC::JSValue(JSC::JSValue::JSFalse); } QScriptDeclarativeClass::Value::Value(QScriptEngine *eng, double value) |