diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-06 11:37:15 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-06 11:37:15 (GMT) |
| commit | f577abca43ec341ac4b96d5a9fb6fcfdc7411965 (patch) | |
| tree | 0df451f4de071f2e055cd3850a1513ef9ecab2e0 /src/3rdparty/webkit/JavaScriptCore/API/JSBase.cpp | |
| parent | 31f4e677256487e7d167517ffd5dd4bef6bb4dd4 (diff) | |
| parent | 1b7d4d29d970405d5559c5641260ea1f09375b27 (diff) | |
| download | Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.zip Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.tar.gz Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API/JSBase.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/API/JSBase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSBase.cpp b/src/3rdparty/webkit/JavaScriptCore/API/JSBase.cpp index fc3d0fe..4a32d35 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/JSBase.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/API/JSBase.cpp @@ -96,7 +96,7 @@ void JSGarbageCollect(JSContextRef ctx) ExecState* exec = toJS(ctx); JSGlobalData& globalData = exec->globalData(); - JSLock lock(globalData.isSharedInstance); + JSLock lock(globalData.isSharedInstance ? LockForReal : SilenceAssertionsOnly); if (!globalData.heap.isBusy()) globalData.heap.collect(); |