diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-06-17 13:13:26 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-06-17 13:13:26 (GMT) |
| commit | 68a2073cca205d8a6c4a44305045e1ac64f664f0 (patch) | |
| tree | b610391e5d85a1fd2086528621e905a5fcaf03f6 /src/script/api/qscriptengine_p.h | |
| parent | 743443fe96725d7c1e5c9cce2422c2ceb9809efc (diff) | |
| parent | d8d547b92e02546cb030ac9d4a45fe0d89e0e7f6 (diff) | |
| download | Qt-68a2073cca205d8a6c4a44305045e1ac64f664f0.zip Qt-68a2073cca205d8a6c4a44305045e1ac64f664f0.tar.gz Qt-68a2073cca205d8a6c4a44305045e1ac64f664f0.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/script/api/qscriptengine_p.h')
| -rw-r--r-- | src/script/api/qscriptengine_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h index fd47208..56366e2 100644 --- a/src/script/api/qscriptengine_p.h +++ b/src/script/api/qscriptengine_p.h @@ -215,10 +215,10 @@ public: static QStringList stringListFromArray(JSC::ExecState*, JSC::JSValue arr); static JSC::JSValue arrayFromVariantList(JSC::ExecState*, const QVariantList &lst); - static QVariantList variantListFromArray(JSC::ExecState*, JSC::JSValue arr); + static QVariantList variantListFromArray(JSC::ExecState*, JSC::JSArray *arr); static JSC::JSValue objectFromVariantMap(JSC::ExecState*, const QVariantMap &vmap); - static QVariantMap variantMapFromObject(JSC::ExecState*, JSC::JSValue obj); + static QVariantMap variantMapFromObject(JSC::ExecState*, JSC::JSObject *obj); JSC::JSValue defaultPrototype(int metaTypeId) const; void setDefaultPrototype(int metaTypeId, JSC::JSValue prototype); @@ -378,6 +378,8 @@ public: QHash<intptr_t, QScript::UStringSourceProviderWithFeedback*> loadedScripts; QScriptValue m_currentException; + QSet<JSC::JSObject*> visitedConversionObjects; + #ifndef QT_NO_QOBJECT QHash<QObject*, QScript::QObjectData*> m_qobjectData; #endif |