summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/qml/qmlinspectoradapter.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Debugger: Merge QmlInspectorAdapter into QmlInspectorAgenthjk2015-08-281-367/+0
| | | | | | | | | There's a 1:1 relation, and the abstraction is not needed anymore. Also remove some unused code. Change-Id: I09a2522deb5d522f46ec7518d19978a038032fbb Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* Debugger: Consolidate QmlEnginehjk2015-07-091-21/+18
| | | | | | | | | | Create a QmlEnginePrivate. Move the QmlDebugClient there. Merge QmlAdapter into QmlEngine Abstraction is not used anymore. Move some helper bits to a qmlengineutils.{h,cpp} Change-Id: I63117355d786cc12641101b7fd38c7cd208d11eb Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Debugger: One more Qt 5 connectionhjk2015-06-101-2/+2
| | | | | | | Was forgotten in eaf718bdea. Change-Id: Ia11999d708ca2d9ffd8d8955945361ce888d4330 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Debugger: Modernize qmlinspectoradapter.cpphjk2015-06-041-44/+42
| | | | | Change-Id: Idb65d85664632121e80a91fd5fae021315c9b33f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* QmlInspectorAdapter: remove connection to destroyedObjectNikita Baryshnikov2015-06-041-6/+0
| | | | | | | | | signal which was removed in ec7a949416edecc383e37e8f8648fbf8eabd4991 Change-Id: I63dfc920c9ea3f97fbf463c55f03b200374e17c2 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* QML: Remove Apply on Save functionalityKai Koehne2015-03-171-193/+0
| | | | | | | | | | | | | | | | | The feature has been actually been disabled since commit ac771eb552e4, but now it's time to also remove the dead code ... Fixing the feature and bringing it out of the experimental state would require quite some effort that apparently nobody is willing to spend. So it's better to remove it. The enablers in the qmldebug library, as well as the QmlJSDelta utility class in qmljs library, are left in though. Change-Id: Idf98a2f946d0db86bef2f20d2349d6ffedba219c Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Clean exported headers of the TextEditor plugin.Friedemann Kleint2015-02-261-0/+3
| | | | | Change-Id: I1e7dd34ba5a51fb0b34d137dc03add4457b32ed1 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-161-6/+6
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Core: Use FileName for file path in IDocumentOrgad Shaneh2015-01-121-5/+5
|/ | | | | Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Core: Introduce ICore::{add,remove}AdditionalContextOrgad Shaneh2014-11-171-2/+2
| | | | | | | | Simplify single operation Change-Id: I172b9dfe8f97324d931d4f332ac1609d230e3400 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
| * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Debugger: Reduce line noisehjk2014-07-281-4/+3
|/ | | | | | | | | Move some function out of the DebuggerCore "namespace", to avoid one indirection and removes clutter in the calling code. Change-Id: I1c870d5c7eeade32fa63dedf581490fbb090cd6a Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* DocumentModel: Make interface statichjk2014-05-131-4/+3
| | | | | | | Move item model implementation to private, adjust user code. Change-Id: Ifbe94e7c7b9b1e8be1b4c531958dbd7a9413af13 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlDebugClient: rename serviceVersion to remoteVersion and return intUlf Hermann2014-05-081-1/+1
| | | | | | | | | | The name change is in preparation for the upcoming unification of the debug server and client APIs. Expressing versions as floats is pretty useless as we cannot properly compare them. Besides, so far we're using exactly 3 different versions: -1 (a.k.a. invalid), 1, and 2. Change-Id: Ie4012d09362009b08a1263b15bc552731a1f255e Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlDebugClient: Rename "status" to "state" for consistencyUlf Hermann2014-05-061-31/+31
| | | | | | | | | | | | | "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>
* Editors: Move id() from editor to document.Eike Ziller2014-03-051-1/+1
| | | | | | Change-Id: Ib81076842ab1c16832224790194b001206404d64 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.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-4/+4
| | | | | | | | | | | | | | | | | | | | 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>
* EditorManager: Use static pattern, adjust surrounding codehjk2013-08-301-1/+1
| | | | | Change-Id: I3255a0150cd9a730336456c5a9f986eb74fefbff Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix usage of EditorManager::editorsForFileNameEike Ziller2013-07-181-2/+1
| | | | | | | And move to using the corresponding method in document model. Change-Id: I80b12ceab8a91c5393b9c0422d660a8896ae09d8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* QmlLivePreview: Don't use EditorManager::openedEditors.Eike Ziller2013-07-181-2/+9
| | | | | | | It doesn't do what one'd think it should, and will be removed. Change-Id: I5f496388854913d1b968a5e0ffe6eaa5ca1430f0 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Rename IDocument::fileName --> filePathEike Ziller2013-07-091-4/+4
| | | | | | | That is what it actually is, wrt how Qt API calls it. Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Switch less often to edit modeEike Ziller2013-06-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This change * Removes IMode::type, ModeManager::activateModeType, and IEditor::preferredModeType, and adds IEditor::isDesignModePreferred instead * Adapts the mode switching code in EditorManager to handle multiple windows, for example switching to edit mode should only happen if the editor/view is in the main window. Otherwise the editor window should be raised and focused * Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor * Reverts the EditorManager::ModeSwitch logic to switch mode or make the current editor visible by default, introducing DoNotMakeVisible flag instead * Fixes a few instances where EditorManager::ModeSwitch should have been used One non-trivial problem left: If you open a .ui file and switch to an external editor window, edit mode is activated, because the current editor no longer is a .ui file, which means that the design mode gets deactivated. Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41 Reviewed-by: David Schulz <david.schulz@digia.com>
* Use EditorManager::openEditorAt instead of duplicating codeEike Ziller2013-06-031-11/+2
| | | | | | Change-Id: I231e89849e2f06958d05a511320ec236b5702a1c Reviewed-by: Aurindam Jana <aurindam.jana@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Clean headers in debugger plugin.Friedemann Kleint2013-03-221-1/+0
| | | | | Change-Id: Ia50e61a82101b699390b23b4f1ea9509619314bb Reviewed-by: hjk <hjk121@nokiamail.com>
* Clean headers in Utils.Friedemann Kleint2013-03-191-0/+2
| | | | | | | | | | Forward-declare QGraphicsOpacityEffect in DetailsButton, QProcessEnvironment in Environment, QFileInfo in fileutils, QUrl in IWelcomePage, FancyLineEdit in PathChooser and remove unneeded headers. Change-Id: I7d5f273530dd2059bbdaf0899f0a3bc7e49e8482 Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix Krazy warnings about values or keys iteration in QML code.Friedemann Kleint2013-03-151-2/+2
| | | | | | Change-Id: I78be5ec702d06ecc155842e9f092a13fc1cd6197 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@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>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-12-141-41/+67
|\ \ | |/ | | | | | | | | | | | | 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-43/+69
| | | | | | | | | | | | | | | | | | | | 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-30/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | 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-3/+9
| | | | | | | | | | | | | | | | 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-27/+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/+4
|\ \ | |/ | | | | | | | | | | | | | | 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/+4
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-11-261-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/cpptools/cppcompletion_test.cpp src/plugins/projectexplorer/kitmanagerconfigwidget.cpp src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qtsupport/baseqtversion.cpp tests/auto/cplusplus/findusages/tst_findusages.cpp Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
| * QML Debugging: Qt 5 CONFIG+=declarative_debug qml_debugAurindam Jana2012-11-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Pass both arguments to qmake. The assumption being that most projects will not mix both Qt Quick 1 and Qt Quick 2. In the case of others, debugging will be enabled only for the first debugging client that is enabled. This is inline with the current behaviour where debugging multiple engines is not supported. Change-Id: I90cd6c6ff559a3a7519ee3ee10690c0e8135c97b Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Inspector: Set the context of consoleAurindam Jana2012-10-251-6/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Debugger: Remove the dependence on QmlJSToolsAurindam Jana2012-10-091-63/+71
|/ | | | | Change-Id: I26765134c19b9a6cf1e7ad26f313e2d4f8faf258 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Debugger: Client for DeclarativeDebuggerAurindam Jana2012-10-011-0/+11
| | | | | | | | A client for DeclarativeDebugger Service. The service is a backport of QmlDebugger service. Change-Id: I868a286756c2d6bcbb2f41904a13d7f691e9704c Reviewed-by: Christiaan Janssen <christiaan.janssen@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-4/+6
| | | | | | | | - Compile with QT_NO_CAST_FROM_ASCII. - Remove single character string constants. Change-Id: Icece98619b6c30e047d3fce00e6ae74bbcd53c67 Reviewed-by: hjk <qthjk@ovi.com>
* Improved check for NULL-pointer derefRobert Loehning2012-07-261-1/+1
| | | | | Change-Id: I48c49f1463a70c269ac25dc1ea691d020724abb8 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QmlJSInspector: Check for null pointersAurindam Jana2012-05-301-7/+9
| | | | | Change-Id: I8d99b109909e596ead2e674eff0de576b2dca411 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
View Lorry Controller Status