diff options
| author | kh <qtc-committer@nokia.com> | 2009-07-29 16:32:57 (GMT) |
|---|---|---|
| committer | kh <qtc-committer@nokia.com> | 2009-07-29 16:32:57 (GMT) |
| commit | 91005e4878c76630390fd17afec2f283fcd5121d (patch) | |
| tree | c9a997a7c542da025ff00549ea80bd517557c577 /src/3rdparty/webkit/JavaScriptCore/API/JSBase.cpp | |
| parent | f21a36efaab400e086a8c1e87f91da595e4a4443 (diff) | |
| parent | b2b626a936d778b89f8fbf33ac914d99876ec4b3 (diff) | |
| download | Qt-91005e4878c76630390fd17afec2f283fcd5121d.zip Qt-91005e4878c76630390fd17afec2f283fcd5121d.tar.gz Qt-91005e4878c76630390fd17afec2f283fcd5121d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
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(); |