diff options
author | Kent Hansen <khansen@trolltech.com> | 2009-09-21 09:18:57 (GMT) |
---|---|---|
committer | Kent Hansen <khansen@trolltech.com> | 2009-09-21 09:21:17 (GMT) |
commit | 74bd11b55388ca6a8e5cfdbdcfb044bb538fafa0 (patch) | |
tree | a856e772686a2f5162078b374afc5ea353ad221d /src/script/api/qscriptengine.cpp | |
parent | 0ebdd27ea802a4b40eaa330725e15213a4072cdc (diff) | |
download | Qt-74bd11b55388ca6a8e5cfdbdcfb044bb538fafa0.zip Qt-74bd11b55388ca6a8e5cfdbdcfb044bb538fafa0.tar.gz Qt-74bd11b55388ca6a8e5cfdbdcfb044bb538fafa0.tar.bz2 |
use JSObject::inherits() instead of JSObject::isObject()
The functions are identical, but in recent WebKit trunk isObject()
doesn't exist anymore. So this renaming is done to prepare for the
import of a more recent JavaScriptCore.
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
-rw-r--r-- | src/script/api/qscriptengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index cb47f5d..7a910d2 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1656,7 +1656,7 @@ QScriptValue QScriptEngine::newVariant(const QScriptValue &object, if (!object.isObject()) return newVariant(value); JSC::JSObject *jscObject = JSC::asObject(QScriptValuePrivate::get(object)->jscValue); - if (!jscObject->isObject(&QScriptObject::info)) { + if (!jscObject->inherits(&QScriptObject::info)) { qWarning("QScriptEngine::newVariant(): changing class of non-QScriptObject not supported"); return QScriptValue(); } @@ -1733,7 +1733,7 @@ QScriptValue QScriptEngine::newQObject(const QScriptValue &scriptObject, if (!scriptObject.isObject()) return newQObject(qtObject, ownership, options); JSC::JSObject *jscObject = JSC::asObject(QScriptValuePrivate::get(scriptObject)->jscValue); - if (!jscObject->isObject(&QScriptObject::info)) { + if (!jscObject->inherits(&QScriptObject::info)) { qWarning("QScriptEngine::newQObject(): changing class of non-QScriptObject not supported"); return QScriptValue(); } |