diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-21 12:00:07 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-21 12:00:07 (GMT) |
| commit | 8d00a0a21f245d15962191e0690d3619735d118b (patch) | |
| tree | 7aaa66528f0ee40d0d2d885f94835d0f09ea4a68 /src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.cpp | |
| parent | 97cec103793a4b9aae8337ffc2ce9a2bd98fb5fc (diff) | |
| parent | 508b447075fb852e61ddf88c92c9099dad292747 (diff) | |
| download | Qt-8d00a0a21f245d15962191e0690d3619735d118b.zip Qt-8d00a0a21f245d15962191e0690d3619735d118b.tar.gz Qt-8d00a0a21f245d15962191e0690d3619735d118b.tar.bz2 | |
Merge commit 'qt/master' into kinetic-graphicseffect
Conflicts:
src/gui/graphicsview/graphicsview.pri
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.cpp index 2f02b1d..bbbe3af 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.cpp @@ -394,7 +394,7 @@ Stringifier::StringifyResult Stringifier::appendStringifiedValue(StringBuilder& return StringifySucceeded; // If this is the outermost call, then loop to handle everything on the holder stack. - TimeoutChecker localTimeoutChecker(m_exec->globalData().timeoutChecker); + TimeoutChecker localTimeoutChecker(*m_exec->globalData().timeoutChecker); localTimeoutChecker.reset(); unsigned tickCount = localTimeoutChecker.ticksUntilNextCheck(); do { |