diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 22:49:55 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 22:50:23 +0100 |
| commit | 75b42f18d886b59dbf3380dd12f39f40005ef08b (patch) | |
| tree | cd1cb5699064fa897f11d9f9f4923c0c0f05d95a /src/plugins/debugger/script/scriptengine.cpp | |
| parent | 43203140461174071f7a3e68bf388a6522556810 (diff) | |
| parent | a6ca348636dd92ab1445cff2286b3293163f5cea (diff) | |
| download | qt-creator-75b42f18d886b59dbf3380dd12f39f40005ef08b.tar.gz | |
Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
Diffstat (limited to 'src/plugins/debugger/script/scriptengine.cpp')
| -rw-r--r-- | src/plugins/debugger/script/scriptengine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp index f5197a6439..5b5f5043f7 100644 --- a/src/plugins/debugger/script/scriptengine.cpp +++ b/src/plugins/debugger/script/scriptengine.cpp @@ -104,7 +104,7 @@ public: private: void maybeBreakNow(bool byFunction); - ScriptEngine *q; + ScriptEngine *q; }; ScriptAgent::ScriptAgent(ScriptEngine *debugger, QScriptEngine *script) @@ -208,7 +208,7 @@ void ScriptEngine::executeDebuggerCommand(const QString &command) void ScriptEngine::shutdown() { - exitDebugger(); + exitDebugger(); } void ScriptEngine::exitDebugger() @@ -618,7 +618,7 @@ bool ScriptEngine::checkForBreakCondition(bool byFunction) showStatusMessage(tr("Stopped at %1:%2.").arg(fileName).arg(lineNumber), 5000); StackFrame frame; - frame.file = fileName; + frame.file = fileName; frame.line = lineNumber; manager()->gotoLocation(frame, true); updateLocals(); @@ -633,7 +633,7 @@ void ScriptEngine::updateLocals() // // Build stack - // + // QList<StackFrame> stackFrames; int i = 0; for (QScriptContext *c = context; c; c = c->parentContext(), ++i) { |