diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
| commit | 34679dd23213881a9632e21e4858377ff90a9006 (patch) | |
| tree | deb9ebf681d4954b2d44858ca1a14d251c31e8eb /src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h | |
| parent | 7669f91c33328505fbe52f4913bd3f8745b76d31 (diff) | |
| parent | 4aa6869877d4906fcfaac5388294748512cace25 (diff) | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/io/qfilesystemwatcher_symbian.cpp
src/corelib/io/qfilesystemwatcher_symbian_p.h
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h index 7ab759ddd..dc11feeac 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h @@ -30,6 +30,10 @@ #include <wtf/HashSet.h> #include <wtf/OwnPtr.h> +#ifdef QT_BUILD_SCRIPT_LIB +#include "SourcePoolQt.h" +#endif + namespace JSC { class ArrayPrototype; @@ -226,7 +230,13 @@ namespace JSC { unsigned profileGroup() const { return d()->profileGroup; } Debugger* debugger() const { return d()->debugger; } - void setDebugger(Debugger* debugger) { d()->debugger = debugger; } + void setDebugger(Debugger* debugger) + { +#ifdef QT_BUILD_SCRIPT_LIB + globalData()->scriptpool->setDebugger(debugger); +#endif + d()->debugger = debugger; + } virtual bool supportsProfiling() const { return false; } |