diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-02 09:40:07 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-02 09:40:07 (GMT) |
| commit | cfd31c28f2e30ee725d23c36ea8349f984b57047 (patch) | |
| tree | 5fcf867475a6fde5b884c9236350460cee0ed95f /src/script/api/qscriptengineagent.cpp | |
| parent | 46c17756dfa231d5ce7a8907330d97807880a04c (diff) | |
| parent | fe85e470d76f6e53759d0fd508e858add5de1eb0 (diff) | |
| download | Qt-cfd31c28f2e30ee725d23c36ea8349f984b57047.zip Qt-cfd31c28f2e30ee725d23c36ea8349f984b57047.tar.gz Qt-cfd31c28f2e30ee725d23c36ea8349f984b57047.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/api/qscriptengineagent.cpp')
| -rw-r--r-- | src/script/api/qscriptengineagent.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/script/api/qscriptengineagent.cpp b/src/script/api/qscriptengineagent.cpp index 84ae380..bc2eea2 100644 --- a/src/script/api/qscriptengineagent.cpp +++ b/src/script/api/qscriptengineagent.cpp @@ -169,6 +169,9 @@ void QScriptEngineAgentPrivate::exceptionCatch(const JSC::DebuggerCallFrame& fra void QScriptEngineAgentPrivate::atStatement(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno, int column) { + QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID); + Q_ASSERT(source != 0); + column = source->columnNumberFromOffset(column); JSC::CallFrame *oldFrame = engine->currentFrame; int oldAgentLineNumber = engine->agentLineNumber; engine->currentFrame = frame.callFrame(); @@ -195,6 +198,9 @@ void QScriptEngineAgentPrivate::didReachBreakpoint(const JSC::DebuggerCallFrame& intptr_t sourceID, int lineno, int column) { if (q_ptr->supportsExtension(QScriptEngineAgent::DebuggerInvocationRequest)) { + QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID); + Q_ASSERT(source != 0); + column = source->columnNumberFromOffset(column); JSC::CallFrame *oldFrame = engine->currentFrame; int oldAgentLineNumber = engine->agentLineNumber; engine->currentFrame = frame.callFrame(); |