diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-09-24 14:35:49 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-09-24 15:36:17 (GMT) |
| commit | aabd12223bda6260756ab19430082477d5669c0a (patch) | |
| tree | 6ca7a12e627915992cfd0038f6ddd8ee244711f4 /src/script/api/qscriptengine_p.h | |
| parent | 270c374c178ec5a532d37168b018cd7ebc844558 (diff) | |
| download | Qt-aabd12223bda6260756ab19430082477d5669c0a.zip Qt-aabd12223bda6260756ab19430082477d5669c0a.tar.gz Qt-aabd12223bda6260756ab19430082477d5669c0a.tar.bz2 | |
Update src/3rdparty/javascriptcore and adapt src/script to the changes.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/script/api/qscriptengine_p.h')
| -rw-r--r-- | src/script/api/qscriptengine_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h index ec41cc9..c43ca61 100644 --- a/src/script/api/qscriptengine_p.h +++ b/src/script/api/qscriptengine_p.h @@ -100,6 +100,8 @@ namespace QScript //some conversion helper functions QScriptEnginePrivate *scriptEngineFromExec(const JSC::ExecState *exec); bool isFunction(JSC::JSValue value); + + class UStringSourceProviderWithFeedback; } class QScriptEnginePrivate @@ -160,7 +162,7 @@ public: JSC::JSObject *callee, bool calledAsConstructor = false); void popContext(); - void mark(); + void mark(JSC::MarkStack& markStack); bool isCollecting() const; void collectGarbage(); @@ -255,6 +257,8 @@ public: QSet<QString> importedExtensions; QSet<QString> extensionsBeingImported; + + QSet<QScript::UStringSourceProviderWithFeedback*> loadedScripts; #ifndef QT_NO_QOBJECT QHash<QObject*, QScript::QObjectData*> m_qobjectData; |