summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-051-21/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
| * Adjust license headershjk2012-10-051-21/+20
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | ScriptConsole: Move from Debugger to QmlJSToolsAurindam Jana2012-10-051-77/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The console is now a part of qmljstools plugin. The console appears as an output pane. A dummy QScriptEngine evaluates expressions when a declarative debug session is not in progress. During a debug session, the expressions are evaluated by the debug services. Task-Number: QTCREATORBUG-7402 Change-Id: Ic2eeac44fb335c706be03b89f8672b0356efe984 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-041-3/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: dist/gdb/Makefile.osx src/libs/qmldebug/qmldebug.qbs src/plugins/android/androidsettingswidget.cpp Change-Id: I85627130b575f7d08f416dea52031fa72019b217
| * UI text: fix capitalization and punctuationLeena Miettinen2012-10-011-1/+1
| | | | | | | | | | Change-Id: I7a974072096689aaa4b1ec1cca93dcd9febe14d9 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
| * Debugger: Remove old codeAurindam Jana2012-10-011-2/+0
| | | | | | | | | | | | | | | | Version specific snippets were introduced to avoid incompatibilities during Qt5 development. Change-Id: I60fa9beafc9d55b687c08e13cdf531baecb10fbb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Do not use the fromAscii() and toAscii() functions.Christian Kandeler2012-09-211-1/+1
|/ | | | | | | | | | They are deprecated in Qt 5. Use fromLatin1() and toLatin1() instead. In Qt 5, these always do the same thing as their "Ascii" counterparts. The same goes for Qt 4, provided QTextCodec::setCodecForCStrings has not been set, which it hasn't. Change-Id: I04edeb376762b6671eff8156094f0d5e2cb8e1ea Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Use QT_NO_CAST_FROM_ASCII for debugger plugin.Friedemann Kleint2012-08-241-2/+0
| | | | | | | | Fix gdmi escape routine by using a traits class to adapt QByteArray/QString. Change-Id: Ic6d2a0c927e4613aec9f69095bbb04a393e9edb9 Reviewed-by: hjk <qthjk@ovi.com>
* Debugger: Fix string usages.Friedemann Kleint2012-08-221-5/+7
| | | | | | | | - Compile with QT_NO_CAST_FROM_ASCII. - Remove single character string constants. Change-Id: Icece98619b6c30e047d3fce00e6ae74bbcd53c67 Reviewed-by: hjk <qthjk@ovi.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QmlDebugger: Edit breakpointsAurindam Jana2012-06-061-2/+3
| | | | | | | Remove and add breakpoint when a breakpoint is edited. Change-Id: Idb231c0e9d44fe295007b299660fcbe3a980a252 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* QmlDebugging: Save few cyclesAurindam Jana2012-05-311-6/+8
| | | | | Change-Id: I6d094605e3983128b844f2156909b98a4016509f Reviewed-by: hjk <qthjk@ovi.com>
* debugger: rework WatchModelhjk2012-05-241-18/+9
| | | | | | | | | | | It's one model for all locals, watch, return, tooltip and inspector data. This allows more streamlined code paths and better isolation of the model data from the WatchHandler. WatchItems are now registered in a hash indexed by iname, so inames can be used as the primary handle to watch data in the WatchHandler interface. Change-Id: Idac0a808b5d785307496d1de4198a1f2e9ce3880 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QmlV8DebuggerClient: Remove unused codeAurindam Jana2012-05-021-44/+0
| | | | | Change-Id: I4b0e04f6914629cc706831515839ecca99079909 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebug: Rename library and (most) classesKai Koehne2012-04-181-2/+2
| | | | | | | | | | | | | | | | | Rename the QmlJSDebugClient lib to QmlDebug (shorter names, easier differentiation with the shared/qmljsdebug lib). Also rename - QDeclarativeDebug* classes to QmlDebug* - QDeclarativeOutputParser class to QmlOutputParser To clarify the features, - Debugger::QmlDebuggerClient is now Debugger::BaseQmlDebuggerClient - QmlEngineDebugClient is now BaseEngineDebugClient - QmlDebuggerClient is now QmlEngineDebugClient - QDeclarativeEngineDebugClient is now DeclarativeEngineDebugClient Change-Id: Ie15713730a614c8ab4b637fad0924f95b54e633f Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QmlDebugger: Refactor QML Signal HandlerAurindam Jana2012-04-161-8/+8
| | | | | | | | | | Refactor QML Signal Handler to QML Signal Emit. This is because the debugger breaks when a matching signal is emitted irrespective of whether there is a handler connected to the signal. Change-Id: I852ace75c1962290717ed127ac5938d7505b9a7e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* QmlV8DebuggerClient: Skip internal framesAurindam Jana2012-04-101-4/+27
| | | | | Change-Id: Id7555807a0fc4d796035c922c04d5d7ced512d81 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QtMessageLogHandler: Sorting child itemsAurindam Jana2012-03-221-1/+1
| | | | | | | | Insert child items in sorted order if the "Sort Members and Classes Alphabetically" is set in Locals And Expressions. Change-Id: Ib21803326ec3f35c9541c08d876c4a38c0202a9f Reviewed-by: hjk <qthjk@ovi.com>
* QtMessageLogHandler: Insert child items in alphabetical orderAurindam Jana2012-03-221-1/+1
| | | | | Change-Id: I644207f5e8b149364e73abf7512240e918260072 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QtMessageLogHandler: Fix crashAurindam Jana2012-03-221-6/+8
| | | | | | | Set a parent when creating QtMessageLogItem. Change-Id: I8faf76059dcc517794a4eb3d202bc14cd1632ca8 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebugging: Fix 'this' in Locals And WatchersAurindam Jana2012-03-211-23/+59
| | | | | | | | | | Incase of global object, query the children only when needed as the response takes a lot of time. Remove cached requests when switching stack frames so that stale responses are not parsed. Change-Id: I70887773952ecaa61da21077ffec321fd5fabbb1 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebugging: Fix Watched ExpressionsAurindam Jana2012-03-211-37/+50
| | | | | | | | | | The data response was incorrectly parsed for watched expressions. This patch fixes the parsing. It also fixes removal and readdition of a watched expression. Change-Id: I1a9e2db3d4963d7fe12ed468ae5466a106011487 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlV8DebuggerClient: Make breakpoint non-pendingAurindam Jana2012-03-141-7/+22
| | | | | | | | Make breakpoint non-pending when the breakpoint is accepted by the v8 debugger. Change-Id: Id67ce764ef6be9279d3fcc0f34734e5ac9541425 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebugging: Assign Value in DebuggerAurindam Jana2012-03-141-3/+4
| | | | | | | | | | Call EXEC instead of SET_PROPERTY for assigning a value in Locals and Expressions. Also check if the id of the object is valid before calling EXPAND. Task-number: QTCREATORBUG-7089 Change-Id: I2769e5345cfb7ecf87e36125821f141821556690 Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
* QmlV8DebuggerClient: Change breakpoint line numberAurindam Jana2012-03-121-11/+9
| | | | | | | | V8 Debugger does not support changing line numbers of active brekpoints. Remove the existing breakpoint and add a new one. Change-Id: I0e6302d6d911887890d674960cc241f89c4cdc96 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebugging: Fix RegressionAurindam Jana2012-03-011-1/+1
| | | | | | | | Fix Run to Line functionality. Regresseion was introduced by fd82e54a5b1ed1e2403d85b6a562c01d3604d45f Change-Id: Ie2d3eb3d0df7ba73950c4d3c70ab25b9e7f7ab36 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlV8DebuggerClient: Relocate breakpointsAurindam Jana2012-02-291-38/+44
| | | | | | | | | Walk the AST to find probable "breakable" code positions and relocate breakpoints. Change-Id: I3033bb85b21436face8265661aa8779c63dcf960 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* QmlV8DebuggerClient: Remove code for older service versionAurindam Jana2012-02-281-70/+21
| | | | | | | | The base service version of QV8DebugService is now 2.0 Support for older versions is not required anymore. Change-Id: I5eb58ea64b1a621c853bdf236abf5412a704cbac Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlCppDebugger: Handling StackAurindam Jana2012-02-281-2/+1
| | | | | | | | | Use a common stackhandler in the mixed engine instead of individual stackhandlers in qml engine and cpp engine. Change-Id: If363fabb32ae7c6e652452ca2b2fbf8593e684a5 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebugging: Show Object Tree in ConsoleAurindam Jana2012-02-211-125/+139
| | | | | | | | Show QML/Javascript objects as a tree when evaluated in the console. Change-Id: I42901bf9bda3f18fb9fb1ca309a8370ccbe37c0a Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* ScriptConsole: Refactor to QtMessageLogWindowAurindam Jana2012-02-201-5/+8
| | | | | | | | | | Move QML/JS independent classes to common Debugger code. A Debugger Engine needs to override evaluateScriptExpression() to provide engine specific script evaluation. Change-Id: I02b23b380a3eb1b12003b30ded0b7d075e44dfed Reviewed-by: hjk <qthjk@ovi.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-201-1/+1
| | | | | | | | And adapt the other API respectively. Change-Id: I1e04e555409be09242db6890f9e013396f83aeed Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-8/+8
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* QmlDebugging: Evaluating expressionAurindam Jana2012-01-111-62/+75
| | | | | | | | Update Locals when evaluating expression and also when activating a specific stack frame. Change-Id: I40ef12e980e67add98c7cad1ec4cd615bf4763ec Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebugging: Remove BreakpointByFunctionAurindam Jana2012-01-091-6/+0
| | | | | | | | Remove BreakpointByFunction capability as it is not supported by the v8debugservice. Change-Id: I60e3d0d6f5669f83fa621cd99f25512cad3dbb96 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebugging: Implement RunToLine capabilityAurindam Jana2012-01-091-4/+27
| | | | | Change-Id: I153c30310ac318d2de8b9a96c6d1e7f80439d306 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebugging: Breakpoint dataAurindam Jana2012-01-091-37/+50
| | | | | | | | Set the function name in the break parameters when the breakpoint is hit. Change-Id: I40d13f273808f7ea44a7fd8c41284ee7f476d286 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebugging: Handle interruptAurindam Jana2012-01-071-23/+37
| | | | | | | | Handle the case where debug break is due to interrupt and not due to hitting a breakpoint. Change-Id: I080ef779558432f9285fb94aaed548ecf476fb91 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QML-Debugger: Compile with QT_NO_CAST_FROM_ASCII.Friedemann Kleint2011-12-211-20/+20
| | | | | Change-Id: Id6f437c54504f6730c8726264f460b8f1631899d Reviewed-by: hjk <qthjk@ovi.com>
* Avoid hitting the anonymous wrapper functions in .qml fileKai Koehne2011-12-211-1/+44
| | | | | | | | | | | | | | | | | | QtDeclarative generates anonymous wrapper functions for QML bindings and slots, e.g. onPressed(): { i++ } becomes (function (onPressed) { i++ } ) v8 will by default break when the anonymous function is called, not when the actual code is executed. If we now hit this outer function we'll relocate the breakpoint to column = 1, and continue. Change-Id: Ieea4f4ea4fbf21d7245a6243fc36d141948ef2ce Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Debugger: Populate "Source Files" for QML, showing shadow .js structureKai Koehne2011-12-201-1/+64
| | | | | | | | | | Request the sources actually seen by v8, and show them in a separate file (click on the leftmost column). Automatically populating 'Source Files' and also making the functionality available for mixed debugging requires some more thought ... Change-Id: Id8f55eed9c842b545434a6c608fb34d370a8f8bb Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QML Debugger: Fix warningYuchen Deng2011-12-201-1/+1
| | | | | Change-Id: If6678115cb2730d61ee9d0e64a81aeffad183f82 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlV8DebuggerClient: Watched ExpressionsAurindam Jana2011-12-191-5/+2
| | | | | | | Expand watched expressions. Change-Id: Ic4e5860931f3a7c6a33f37697585f43d7c2664a0 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Fix build breakAurindam Jana2011-12-161-5/+4
| | | | | Change-Id: I78825294251b364b471b37479f3ae57893e4f903 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* QmlV8DebuggerClient: Log the V8 VersionAurindam Jana2011-12-161-0/+8
| | | | | Change-Id: Ie51db80902a3dbc1fcfe352eb770965555551dba Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlV8DebuggerClient: Evaluate expressionsAurindam Jana2011-12-161-6/+12
| | | | | | | | Check if the current stack frame is usable before sending eval request to v8. Change-Id: Ief687516b1b4a323c2b602f1b54d83ff7661bed4 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlV8DebuggerClient: Changes related to v8DebugService protocolAurindam Jana2011-12-161-506/+464
| | | | | | | | | V8DebugService uses a different protocol. This fix now uses the new protocol. It also optimizes the number of debug requests made to retrieve debug information. Change-Id: I40d7b1d4ab0535831c6a19cadd9b48763934c1de Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebugger: Make sure v8 messages show up in the debugger logKai Koehne2011-12-071-3/+38
| | | | | Change-Id: Icd65cde2bcb09eaa35cf67399e60e9d9f4484105 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Debugger: Fix warningYuchen Deng2011-12-071-1/+1
| | | | | | | | | warning: C4819: The file contains a character that cannot be represented in the current code page (936). Save the file in Unicode format to prevent data loss. Change-Id: I33ff1b1295df234da9cf42efc5d3745c316f6528 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
View Lorry Controller Status