summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-111-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | QmlV8DebuggerClient: Evaluate ExpressionAurindam Jana2011-11-081-0/+16
| | | | | | | | | | | | | | | | | | V8 engine may return an anonymous event for Evaluation of an expression instead of a response, if the expression has syntax error. This fix handles this particular case. Change-Id: Ic89252b04eb4d6f7e6b0b2e03067f031f1f446ed Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlV8DebuggerClient: Watched ExpressionsAurindam Jana2011-11-071-7/+14
| | | | | | | | | | | | | | | | Show errors in evaluating watched expressions in the watch window and not in the console. Change-Id: I4792d54268bcdef085aa4dab091c5f27a4a01c02 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlV8DebuggerClient: Optimize debug requestsAurindam Jana2011-11-071-164/+216
| | | | | | | | | | | | | | | | | | Do not send duplicate and redundant requests. Use a queue to ensure processing of one request at a time during a debug break Change-Id: I086ef3b578922fb247f9d35f9759855227e63eaa Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlV8DebuggerClient: Local VariablesAurindam Jana2011-11-011-46/+93
| | | | | | | | | | | | | | | | | | Show "this" data in the locals window. If handle is not present in ref list then fetch Local data asynchronously. Insert the data when lookup request succeeds. Change-Id: Ie342bcb963b76b8fcdb958979b59fb084fe50e51 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlV8DebuggerClient: Show Watched ExpressionsAurindam Jana2011-11-011-38/+88
| | | | | | | | | | Change-Id: Ic51116741556ba1f36f64c7d1341ba993bdeacc9 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlV8DebuggerClient: Locals WindowAurindam Jana2011-11-011-14/+111
| | | | | | | | | | | | | | Show locals that are visible in current scope. Change-Id: I3f661052485b0ed14b1f1a674d3421188cd495f9 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlV8DebuggerClient: Set Correct Initial stateAurindam Jana2011-10-311-1/+1
| | | | | | | | | | Change-Id: I86bc33a224dd765ec5c27871f7ae7f3208ed615b Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlV8DebuggerClient: Show Exception Underline under correct line.Aurindam Jana2011-10-281-1/+1
| | | | | | | | | | Change-Id: I30a38150930657109dba2a037de34a33ca4ebf1c Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlV8DebuggerClient: Fix Crash.Aurindam Jana2011-10-271-1/+1
| | | | | | | | | | | | | | Call resetState() in ctor. Change-Id: Ib95477adcb198fb2f9de26f1ad6cd64f0508fcdd Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlV8DebuggerClient: Show exception info in console.Aurindam Jana2011-10-271-0/+4
| | | | | | | | | | | | | | | | | | Exception Information is printed in QML Script Console if breakpoint of type "Break when JavaScript exception is thrown" is enabled. Change-Id: I9bc5839ba7b7019682e03cc5d71ae6e44e23f63a Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlV8DebuggerClient: Edit variables in Locals Window.Aurindam Jana2011-10-271-2/+8
| | | | | | | | | | Change-Id: Id0c368b1f39fdffdcb0f46a4d74c364e021bb332 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlV8DebuggerClient: Edit breakpointsAurindam Jana2011-10-271-0/+10
| | | | | | | | | | | | | | | | Enable and disable breakpoints. Condition and ignoreCount parameters can be reset for breakpoints. Change-Id: I3427308964eff679828b25c473166524f45f0d56 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlV8DebuggerClient: Introduce Debugger client statesAurindam Jana2011-10-271-21/+40
| | | | | | | | | | | | | | | | | | | | Change List: Introduced states to prevent possible race condition on the service side which uses an event loop. Evaluations in QML Script Console is reflected in the Locals Window. Change-Id: I1b7644b856168fd59e1cf1d1498c7107d42f2af5 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlV8DebuggerClient: Refactored codeAurindam Jana2011-10-271-458/+1240
|/ | | | | | | | | | | | | Change List: a) Refactored code: Shifted JSON message creation to QmlV8DebuggerClientPrivate. b) QScriptEngine is used for JSON instead of JsonValue and JsonInputStream. c) Locals Window displays all variables accessible in the current context. Change-Id: I82e73f6c57482408f5fc501c908aa96297d3d754 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* V8DebuggerClient: Enable breakpoints on ExceptionsAurindam Jana2011-10-111-17/+35
| | | | | | | | | | | Previously break on exceptions was always enabled. Now, the user can add a breakpoint on Javascript Exceptions from the breakpoint window in the debugger. Change-Id: Ia9ee813d2fccf89b607fe1dcbad47b4084155a48 Reviewed-on: http://codereview.qt-project.org/6348 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Debugger: Change BreakpointOnSignalHandler to BreakpointOnQMLSignalHandlerAurindam Jana2011-09-301-2/+2
| | | | | | | | Change-Id: Ic71299c38863cdb55862ced7348b2bdc9cf39555 Reviewed-on: http://codereview.qt-project.org/5743 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* JSDebugger: Enable break on events.Aurindam Jana2011-09-161-7/+22
| | | | | | | | | | | | The user can request Javascript break on event. The user can provide this info in the Breakpoints Window and provide the slot which will be called when the event occurs. For example: specify "onTriggered" if you need to break on Timer triggered event. Change-Id: If936d7402f5978a182132fdcca75515588364e16 Reviewed-on: http://codereview.qt-project.org/4758 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* JSDebugger: Break on ExceptionAurindam Jana2011-09-141-43/+142
| | | | | | | | | | | | The debugger breaks on Javascript exception. The error message is printed on the ScriptConsole and the relevant code is marked with a wavy underline. Change-Id: I5e6f603430c3b8a0db450d1e8c821714ec0140ab Reviewed-on: http://codereview.qt-project.org/4276 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Debugger: Client Service synchronizationAurindam Jana2011-08-251-2/+2
| | | | | | | | | | | Sends connect command after all initial commands have been sent. This ensures that the initialization is complete before the start of the debugging session. Change-Id: I1903caa9c213fef4e6b40df89a352d80e350a46d Reviewed-on: http://codereview.qt.nokia.com/3526 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Debugger: Set breakpoints on actual locations in codeAurindam Jana2011-08-251-7/+2
| | | | | | | | | This fix sets moves breakpoints on commented lines to the next executable line. Change-Id: Ie9ca8a7c6e0360ce4a916053ef7aedd1cc28484d Reviewed-on: http://codereview.qt.nokia.com/3525 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Improved breakpoint handling in qmlv8debuggerclientAurindam Jana2011-08-231-51/+64
| | | | | | | | | Breakpoints are resolved and set only after querying for their actual locations from v8 engine. Change-Id: If119865f50d9f91a4930096751599a4f22bc9d26 Reviewed-on: http://codereview.qt.nokia.com/3406 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Debugger: Suppress v8 specific localsAurindam Jana2011-08-231-0/+4
| | | | | | | | | This Hack ensures that v8 specific locals are not visible in the debugger locals and watchers window Change-Id: I3958a4dc0c9ded3de2686546ad1d51f080952b6a Reviewed-on: http://codereview.qt.nokia.com/3408 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Refactoring v8debuggerclient and scriptdebuggerclientAurindam Jana2011-08-231-3/+4
| | | | | | | Change-Id: Ifa2e9a9901a166907bd7c3999421146b07bd1c59 Reviewed-on: http://codereview.qt.nokia.com/3328 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Synchronize the client with the debug serviceAurindam Jana2011-08-231-1/+13
| | | | | | | | | | | The v8 engine is blocked till the client is connected to the service to ensure proper hitting of breakpoints. Task-number: QTCREATORBUG-5412 Change-Id: Iec772cb547a31fef4cccbd4bb1116699c52d20e5 Reviewed-on: http://codereview.qt.nokia.com/3308 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Notify disconnect to debug server when inferiorshutdownrequestedAurindam Jana2011-08-171-0/+12
| | | | | | | Change-Id: I15bb1342f647362cb00e4b0d0453b663a2d3f637 Reviewed-on: http://codereview.qt.nokia.com/3095 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Changed the behaviour of setting breakpoints in qml files.Aurindam Jana2011-08-171-26/+16
| | | | | | | | Delegates setting of breakpoints to functions that set/reset/change the breakpoint one at a time. Change-Id: I553a74b05cf19c9d2436344db67bc962da18457f Reviewed-on: http://codereview.qt.nokia.com/3082 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Remove warning for unused paramters in qmlv8debuggerclient.Aurindam Jana2011-08-041-3/+3
| | | | | | | Change-Id: I4e82880f9026e5b9c321a21e9995724b0744550b Reviewed-on: http://codereview.qt.nokia.com/2629 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Delegate javascript debugging to Script and V8 debugger clients.Aurindam Jana2011-08-031-0/+624
The appropriate client handles the debugging based on the service available at the server side. Change-Id: I46b66036f700fc7e45e8b38cef7f1ce1445b1122 Reviewed-on: http://codereview.qt.nokia.com/2497 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>