summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/qml/qmlcppengine.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Debugger: Remove dead codeTobias Hunger2013-09-131-2/+0
| | | | | Change-Id: Id626cd25efec5fd00ccd87fac4de429c9cdabf8b Reviewed-by: Tobias Hunger <tobias.hunger@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>
* Merge remote-tracking branch 'origin/2.8'Oswald Buddenhagen2013-08-211-3/+0
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/cpptools/cppcompletion_test.cpp src/plugins/cpptools/cpptoolsplugin.h src/plugins/projectexplorer/customtoolchain.cpp src/plugins/vcsbase/command.cpp Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
| * Debugging: Continue Cpp debugging even if QML debugger failsAurindam Jana2013-08-051-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In mixed debugging, QML debugger is the slave engine. Continue debugging with the master engine i.e. Cpp engine even if the slave engine fails. The slave engine may fail when the application is not set up for QML/JS debugging or when there are insufficient available ports etc. Task-number: QTCREATORBUG-9836 Change-Id: I2549196413c839e660925fe2edb3182e6848b5fc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix coding style for else statementsOrgad Shaneh2013-07-171-2/+2
|/ | | | | Change-Id: I1309db70e98d678e150388c76ce665e988fdf081 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* AndroidDebugging: Enable Cpp/QML mixed debuggingAurindam Jana2013-04-191-0/+12
| | | | | Change-Id: Ie748b52a93916b332f1e4fa7c6ff04dd6cc30bfa Reviewed-by: hjk <hjk121@nokiamail.com>
* Remove internal class BaseTextMarkRegistry from exported header.Friedemann Kleint2013-03-261-0/+1
| | | | | Change-Id: Ieeffe65be2d7c8f07f41f7211853d616a6aceb85 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Clean headers in debugger plugin.Friedemann Kleint2013-03-221-6/+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-11-301-2/+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-2/+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>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-11-271-0/+8
|\ \ | |/ | | | | | | | | | | | | | | 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-0/+8
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Debugger: Rework thread data aquisitionhjk2012-10-231-2/+2
| | | | | | | | | | | | | | | | | | Listen to gdb/MI notifications when possible. This is more granular, gives access to the thread group id and takes care of thread changes at any time. Change-Id: I8c67f6f19b204059deefdf7e07fe3b4ce13ed963 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Debugger: Remove the dependence on QmlJSToolsAurindam Jana2012-10-091-5/+4
| | | | | | | | | | 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-6/+0
|/ | | | | | | | | | | | | | 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>
* debugger: simplify DebuggerEngine constructionhjk2012-08-161-24/+8
| | | | | | | The master engine pointer can be given later. Change-Id: I4d72679dcbd5fe7291067a5e78c984d26cc187aa Reviewed-by: hjk <qthjk@ovi.com>
* debugger: simplify parameter guessinghjk2012-08-161-6/+3
| | | | | | | | | With profiles we have more reliable information, no need for some of the guessing anymore. Change-Id: I1818fbb112d44c99ef96c8643256432805a1b97b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* debugger: don't store active languages twicehjk2012-08-151-1/+1
| | | | | Change-Id: I6517b42b4cfd0d2d919fa2971c3ea0995443cbf3 Reviewed-by: hjk <qthjk@ovi.com>
* Changed return type of :ICore::mainWindow() to QWidget*Konstantin Tokarev2012-07-191-1/+0
| | | | | | | | Also removed all <QMainWindow> includes which are not needed anymore. Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4 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>
* QmlDebug: Fix crash when remote setup failsTyler Mandry2012-06-251-1/+2
| | | | | Change-Id: Ia9b6e86b74425ed2c5bc113f918f1d64d88c328c Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* debugger: merge notifyEngineRemoteSetup* and handleRemoteSetup*hjk2012-06-131-8/+8
| | | | | | Change-Id: I89abcb0dcceef6767cb3e78f4e85c1cd718e78c1 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Fix compilation.Christian Kandeler2012-06-081-1/+1
| | | | | | Change-Id: Iabaa6fd23ae3ab80c405a698e005eed6d5b4c9d1 Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QmlInspector: Update inspectorAurindam Jana2012-06-081-1/+4
| | | | | | | | | Update inpector when evaluating expression in inspector for mixed debugging. Change-Id: If2bad9d59b3ec3c0f2aa2a2d5f8a594701662bd0 Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* WatchHandler: Add isInspect()Aurindam Jana2012-05-151-1/+1
| | | | | Change-Id: I237f77554a06bf7c139a8ae5cfef79c6fb4c8507 Reviewed-by: hjk <qthjk@ovi.com>
* Debugger: Don't trigger gdb calls for inspect propertiesKai Koehne2012-05-101-1/+2
| | | | | Change-Id: Iaed71894cb2b2e340e7fbbe2045842bc85bd5fe0 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Merge QML inspector into debugger pluginKai Koehne2012-05-091-0/+3
| | | | | | | | | 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>
* QmlCppEngine: Update Views when switching between engines.Aurindam Jana2012-04-251-8/+14
| | | | | Change-Id: I90958e77c4d8c845ef6e55fe65eaffe0ac24dcc5 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlCppEngine: Fix cpp bp insertion when debugging QMLKai Koehne2012-04-111-3/+11
| | | | | | | | | The cpp slave will be interrupted when inserting breakpoints. Track in this case the cpp engine state until it's running again. Task-number: QTCREATORBUG-7230 Change-Id: I4cf275916d8f0581916d95f2f440ea12358aeeeb Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QmlCppEngine: Call quitDebugger already in InferiorShutdownRequestedKai Koehne2012-04-101-3/+4
| | | | | | | | Doing it in (CppEngine) EngineShutdownOk will result in a write to an already closed socket. Change-Id: Ie9712f33d57348ecb27e31eaeb44f42f159a400c Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Debugging: Pass a DebuggingLanguage arg in executeDebuggerCommand()Aurindam Jana2012-04-101-6/+3
| | | | | Change-Id: I99eedc86c987615072b7400051b61700b98ebab3 Reviewed-by: hjk <qthjk@ovi.com>
* QmlCppDebugger: Fix tool tip expressionAurindam Jana2012-03-301-2/+14
| | | | | Change-Id: I1dd81d87c744b4a7f8bd86ac08d95bc5e63bd17f Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* QmlJSInspector: Enable/Disable based on engine stateAurindam Jana2012-03-301-0/+1
| | | | | Change-Id: I078d12fb16fe61908e5b90ebf819c9fd9e8faae0 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlCppEngine: Return engine capabilities of current engineAurindam Jana2012-03-291-1/+6
| | | | | Change-Id: If006ecaf09314c00822a70f790a69eb73edc2d28 Reviewed-by: hjk <qthjk@ovi.com>
* QmlJSInspector: Reposition the Tool BarAurindam Jana2012-03-281-1/+1
| | | | | | Change-Id: I529f976e90fef1670e65b650525b6f31e8b8f397 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* QmlCppDebugger: Quit the qml debugger before the connection already closedKai Koehne2012-03-081-2/+2
| | | | | Change-Id: If8eddda3f99b6aef501f43f05b6667c250ab7659 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QmlCppEngine: State TransitionsAurindam Jana2012-03-021-7/+8
| | | | | | | Ensure proper state transitions of the slave engines. Change-Id: I875543f4d547fccf5df30b78a071e1c3d3d7f18f Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlCppDebugging: Always Delegate call to Cpp EngineAurindam Jana2012-03-021-11/+1
| | | | | | | | Mixed Engine delegates all calls to CppEngine. The state transitions of the cpp engine ensure that the qmlengine is called correctly. Change-Id: I7490858a91f5120a83b781ca605ad157e19d7949 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlCppDebugger: Handling StackAurindam Jana2012-02-281-43/+2
| | | | | | | | | 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>
* QmlCppDebugger: Shutdown engine on port busyAurindam Jana2012-02-281-0/+2
| | | | | | | | Shutdown the debugger engines when the qmljsdebugger port is busy. Change-Id: If7f470b04bae26f3bac11863f697b260b463ca4e Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlCppDebugger: Implement notifyInferiorIll()Aurindam Jana2012-02-231-0/+13
| | | | | Change-Id: I6d2091fff62eb0dabceda4da4eb49d2f63f99484 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* ScriptConsole: Refactor to QtMessageLogWindowAurindam Jana2012-02-201-0/+11
| | | | | | | | | | 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>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-2/+2
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Debugger: Simplify handling of requestRemoteSetup in QmlCppEngineKai Koehne2012-01-311-25/+15
| | | | | | | | Just emit the requestRemoteSetup on your own in QmlCppEngine. Also properly check the related state transitions in DebuggerEngine. Change-Id: I15dc4236303911126de7eee63ed996bdd8e5c5a8 Reviewed-by: hjk <qthjk@ovi.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* QmlCppEngine: Fix warnings about invalid state changesKai Koehne2012-01-191-59/+167
| | | | | Change-Id: Iaa45ff106f5f71a2c7f4729c64c281921b855f80 Reviewed-by: hjk <qthjk@ovi.com>
View Lorry Controller Status