summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove more unused code from the QML debugger client.Erik Verbruggen2013-11-071-105/+2
| | | | | Change-Id: I672c1aee70b74a2763fef8584aa057f1f497aff6 Reviewed-by: hjk <hjk121@nokiamail.com>
* Remove unused code from the QML debugger client.Erik Verbruggen2013-11-071-120/+0
| | | | | Change-Id: I286c690e4e54c766ae4d345add3f78e867863005 Reviewed-by: hjk <hjk121@nokiamail.com>
* QmlDebugger: Exchange supported QDataStream versionsKai Koehne2013-11-011-3/+4
| | | | | | | | | | | | | | Use the lowest QDataStream version common to both the server and client. The server part was added to Qt 5.0 (commit 7f7cd79e), but we haven't used that yet. THis fixes a regression in the inspector where only some properties are shown. Task-number: QTCREATORBUG-10186 Change-Id: If6699eb7261e480587f6a21d54fb6b6107669b8f Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Kill ";;" at end of statementNikolai Kosjar2013-09-041-1/+1
| | | | | Change-Id: I177094f19978e07f85e42b34701d8f03cd26665e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Remove superfluous include paths from project files.Christian Kandeler2013-09-021-7/+7
| | | | | | | | | | | | | | | | | | | | A lot of our build system files specify unneeded include paths. These roughly fall into the following categories: a) Paths that are already set in more general files such as qtcreator.pri. b) Paths that serve no purpose at all, possibly left over from earlier versions of the project. c) Paths that act as workarounds for wrong include statements of the form '#include "xyz.h"', where xyz.h is not in the same directory as the including file. This patch removes such path specifications and fixes the offending include statements from case c). Tested on Linux, Windows and OSX with qmake and qbs. Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Debugger: Remove some deprecated methodshjk2013-08-191-4/+5
| | | | | Change-Id: I67254bb6d3d23e9fa9e121df0b3b923330cfe84a Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Fix usage of EditorManager::editorsForFileNameEike Ziller2013-07-181-6/+1
| | | | | | | And move to using the corresponding method in document model. Change-Id: I80b12ceab8a91c5393b9c0422d660a8896ae09d8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/2.8' into HEADEike Ziller2013-07-181-0/+5
|\
| * QmlDebugging: Reset exception code highlightingAurindam Jana2013-07-161-0/+5
| | | | | | | | | | | | | | Clear code highlighting when debugging session ends. Change-Id: I32844444161bbb609864926e12220f9fb0f492e2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Fix marking JavaScript lines that threw an exceptionEike Ziller2013-07-161-28/+30
| | | | | | | | | | | | | | | | | | Since EditorManager::openedEditors doesn't exactly do what one would expect, it was only marking a single editor even if there were multiple editors on the same document. Change-Id: Iae579c2cfd8455de2783d39fa69944fe92dfc60a Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* | Merge remote-tracking branch 'origin/2.8'Eike Ziller2013-07-121-3/+11
|\ \ | |/ | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I1310d473584f1e2cd44008d45747c868103bbde1
| * QmlConsole: Check for duplicate childrenAurindam Jana2013-07-111-1/+7
| | | | | | | | | | | | | | | | | | When constructing the console item tree, check for duplicate entries. Change-Id: Ibc5aa150287ef5e2ee4b691a71bb170308a1fde7 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * QmlConsole: Fix infinite recursion bugAurindam Jana2013-07-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | The queried v8 object sometimes returns a child item that refers to itself triggering an infinite recursion. Task-number: QTCREATORBUG-9747 Change-Id: I30dfbb834ebeb39c33a6050d4b4860b1b47f34d9 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Rename IDocument::fileName --> filePathEike Ziller2013-07-091-1/+1
|/ | | | | | | That is what it actually is, wrt how Qt API calls it. Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Clean headers in debugger plugin.Friedemann Kleint2013-03-221-8/+0
| | | | | Change-Id: Ia50e61a82101b699390b23b4f1ea9509619314bb Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-03-181-0/+14
|\ | | | | | | | | | | | | Conflicts: doc/src/debugger/qtquick-debugger-example.qdoc Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
| * QmlDebugging: Expand watch data that were previously expandedAurindam Jana2013-03-141-0/+14
| | | | | | | | | | | | | | | | | | | | | | The watch data model is cleared on every debug step. Hence, tracking of expanded watch data is lost. Now, we keep track of expanded watch data when stepping. However, we still lose track of this data on a scope/stack change. Task-number: QTCREATORBUG-8901 Change-Id: I1dc609cae1c3a36d8320864f71336b655eaa09d1 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix Krazy warnings about values or keys iteration in QML code.Friedemann Kleint2013-03-151-20/+13
| | | | | | | | | | | | Change-Id: I78be5ec702d06ecc155842e9f092a13fc1cd6197 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* | Qt5: Don't use the deprecated {QString,QChar}::fromAscii()Debao Zhang2013-02-261-1/+1
|/ | | | | | Change-Id: Ic1d302c2186b11ffec5139f4f491d477d334ec8f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-111-2/+13
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbp src/libs/ssh/sshconnection.cpp Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
| * QmlDebugger: Insert locals correctlyAurindam Jana2012-10-101-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | The watchhandler needs to be reset for locals before inserting the values of a new frame. Also the DebuggerTooltipManager needs to be notified. The values of the locals in the LocalsAndExpressions window should be editable. Task-number: QTCREATORBUG-7992 Change-Id: I556e23b408db09b510f1f2bc350ff55187ec87c2 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* | Debugger: Remove the dependence on QmlJSToolsAurindam Jana2012-10-091-9/+9
| | | | | | | | | | Change-Id: I26765134c19b9a6cf1e7ad26f313e2d4f8faf258 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* | 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>
View Lorry Controller Status