diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-28 17:21:47 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-29 09:00:11 (GMT) |
| commit | 5d68ac574e7edbfd91c53e96c80045effa17a1e9 (patch) | |
| tree | 12b66e75b36606f4de915e6b4bb27962d2231633 /src/script | |
| parent | eeb5c3dba27b02f6ddeb69257e78b22149ca8487 (diff) | |
| download | Qt-5d68ac574e7edbfd91c53e96c80045effa17a1e9.zip Qt-5d68ac574e7edbfd91c53e96c80045effa17a1e9.tar.gz Qt-5d68ac574e7edbfd91c53e96c80045effa17a1e9.tar.bz2 | |
QScript: remove JSC::JSLock
They are useless and cause warnings in the code.
Reviewed-by: Kent Hansen
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index c566f25..8560214 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -44,7 +44,6 @@ #include "CodeBlock.h" #include "Error.h" -#include "JSLock.h" #include "Interpreter.h" #include "PrototypeFunction.h" @@ -1002,7 +1001,6 @@ QScriptEnginePrivate::~QScriptEnginePrivate() detachAllRegisteredScriptStrings(); qDeleteAll(m_qobjectData); qDeleteAll(m_typeInfos); - JSC::JSLock lock(false); globalData->heap.destroy(); globalData->deref(); while (freeScriptValues) { @@ -1291,7 +1289,6 @@ bool QScriptEnginePrivate::isCollecting() const void QScriptEnginePrivate::collectGarbage() { - JSC::JSLock lock(false); QScript::APIShim shim(this); globalData->heap.collectAllGarbage(); } @@ -1321,7 +1318,6 @@ JSC::JSValue QScriptEnginePrivate::evaluateHelper(JSC::ExecState *exec, intptr_t bool &compile) { Q_Q(QScriptEngine); - JSC::JSLock lock(false); // ### hmmm QBoolBlocker inEvalBlocker(inEval, true); q->currentContext()->activationObject(); //force the creation of a context for native function; |