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/qscriptvalue.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/qscriptvalue.cpp')
| -rw-r--r-- | src/script/api/qscriptvalue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index 2ca036a..1d73a8f 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -2321,7 +2321,7 @@ bool QScriptValue::isQMetaObject() const Q_D(const QScriptValue); if (!d || !d->isObject()) return false; - return JSC::asObject(d->jscValue)->isObject(&QScript::QMetaObjectWrapperObject::info); + return JSC::asObject(d->jscValue)->inherits(&QScript::QMetaObjectWrapperObject::info); } /*! |