summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/qml/qmlinspectoradapter.h
Commit message (Collapse)AuthorAgeFilesLines
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QmlDebugClient: Rename "status" to "state" for consistencyUlf Hermann2014-05-061-4/+4
| | | | | | | | | | | | | "state" is the more widely used term and we should follow that convention. We also need to distinguish between the state of the underlying network socket and the client itself. The change makes this explicit. As preparation for the upcoming centralized debug support the "State" enum of the debug client is also moved into the QmlDebugClient class. Change-Id: Ib9d7e03d23528f16ed696ed3518e813d11ea1c32 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Clean up single namespace forward-declarationsOrgad Shaneh2014-02-121-3/+1
| | | | | | | | | | | | | | | | | | Done using the following ruby script: Dir.glob('**/*.h').each { |file| if File.file?(file) s = File.read(file) t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') } if t != s puts file File.open(file, 'w').write(t) end end } Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e Reviewed-by: hjk <hjk121@nokiamail.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove superfluous include paths from project files.Christian Kandeler2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
* Clean headers in debugger plugin.Friedemann Kleint2013-03-221-3/+0
| | | | | Change-Id: Ia50e61a82101b699390b23b4f1ea9509619314bb Reviewed-by: hjk <hjk121@nokiamail.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>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-12-141-5/+14
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qtsupport/baseqtversion.cpp Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
| * Inspector: Remove unnecessary const in argument listAurindam Jana2012-12-111-4/+4
| | | | | | | | | | Change-Id: I2eb3df7b8a50763141c5044c89b4c04b483ad151 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
| * Inspector: Enable/disable tools on engine stateAurindam Jana2012-12-111-7/+16
| | | | | | | | | | | | | | | | | | | | On a debug break, inspector tools cannot be used as the gui thread is blocked. Task-number: QTCREATORBUG-5466 Change-Id: I808d751b1ade7e4a5c98e87fec7bb4cb02715ad8 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-11-301-4/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/editormanager/openeditorsview.cpp src/plugins/debugger/qml/qmlengine.cpp src/plugins/debugger/qml/qmlinspectoradapter.cpp src/plugins/qtsupport/exampleslistmodel.cpp src/plugins/qtsupport/exampleslistmodel.h src/plugins/welcome/welcomeplugin.cpp Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
| * QML/JS Console: Update contextAurindam Jana2012-11-271-1/+1
| | | | | | | | | | | | | | | | Update context from QML object tree or the stack frame depending upon debugger engine state. Change-Id: I4e6affba37acc016513ad95cd278a400aaa18c49 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
| * Inspector: Disable object selection from EditorAurindam Jana2012-11-271-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicking around QML code in the editor would update the Inspector. This is now disabled. The problem with the behaviour is that the object tree would be expanded and that may be unwelcome for some users. Also some code snippets may be shared by multiple objects, for eg. a custom QML component. In this case, the behaviour was undefined as to which object in the tree would be selected. This case of 'one-to-many' was not handled. Finally, the inspector queries for object ids lazily. Hence, sections of code may not be associated with an id resulting in unknown behaviour. Task-number: QTCREATORBUG-8246 Change-Id: I6266fd0767d0619af70387e2e867a756548120ca Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-11-271-2/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: share/share.qbs src/plugins/cpptools/cppchecksymbols.cpp src/plugins/texteditor/behaviorsettingswidget.cpp Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
| * Inspector: Update Editor on object selectionAurindam Jana2012-11-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | When an object is selected in the Inspector, the Editor is updated to show the relevant code. Task-number: QTCREATORBUG-8246 Change-Id: I4f7fbcccdeb22849682fa72c63e87a78f48d185b Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* | Inspector: Set the context of consoleAurindam Jana2012-10-251-1/+0
|/ | | | | | | | | | | The current selected item in the inspector view is set as the context of the console. Task-number: QTCREATORBUG-7439 Change-Id: Ibc980218751ce4afacf714cf1ab34f0a36550b2c Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QmlJSInspector: Remove dependency on QmlJSToolsAurindam Jana2012-05-291-3/+2
| | | | | | | | | As Location information is already cached, there is no need to fetch the information from the QmlJS Semantic info. Task-number: QTCREATORBUG-7409 Change-Id: I9cc3dce0910632cfe517f7697d74691e6675793b Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Debugger: Change in response for message "destroyObject".Simjees Abraham2012-05-291-1/+1
| | | | | | | | | Response for "destroyObject" now has the debugId of the destroyed object. This is used to fetch the parent object rather than querying the engine context. Change-Id: I2e5b7650cbe847117cce6952206dd479ee696f0e Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QmlJSInspectorAgent: Refactor codeAurindam Jana2012-05-251-1/+1
| | | | | | | | Try to use the watchHandler for referring to the object tree instead of caching the object tree locally. Change-Id: I68624771ef49d50f2cf0d6d580b1b34d57483178 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* QmlJSInspectorAdapter: remove onObjectTreeUpdated()Aurindam Jana2012-05-241-1/+0
| | | | | Change-Id: I716ea2417cea5096abc7d740899c6988fe5dcbd8 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Debugger: Response for DESTROY_OBJECT message is used.Simjees Abraham2012-05-211-0/+1
| | | | | | | | Response for DESTROY_OBJECT message is used to refresh the object tree such that the destroyed object is not shown in the tree view. Change-Id: I32d72fa75bbdca6c63551e71395816597dcc0b75 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Debugger: Apply on Save only when Engine client is connectedSimjees Abraham2012-05-151-0/+3
| | | | | | | | | Creation of the Text previews are done only when the engine client is connected and they are deleted once the engine client changes from the connected state. Change-Id: I325d0d1a281b9e8fab4ddf9ff8ea4f5e60d4ac2a Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Debugger:Apply Changes on Save modified for unsync. changes.Simjees Abraham2012-05-151-0/+2
| | | | | | | | | The user is given an option to reload the QML app if he has done any unsynchronizable change. If the user opts to reload the QML, Inspector informs the qtdevlarative to do so. Change-Id: Iefc044e64380e64415630b051a60d6fe9fedfe04 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebug: RenamingKai Koehne2012-05-101-16/+14
| | | | | | | | | Move Status enum out of QmlDebugClient and drop "QmlDebug" prefix for the different 'Reference' structs. Allows to avoid 'using namespace in QmlDebug' in header files. Change-Id: Id9857977300e86d637cf128ff3417d8b24c8e995 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Merge QML inspector into debugger pluginKai Koehne2012-05-091-0/+150
Merge QmlJSInspector plugin into the debugger. Also merge the extra Inspector window with the Locals & Watchers: It now shows the QML object tree in the running state. Change-Id: I59ae0c1b970a48ba10ecda92ed3ba765d94b1d9c Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
View Lorry Controller Status