summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/qml/qmlcppengine.h
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* AndroidDebugging: Enable Cpp/QML mixed debuggingAurindam Jana2013-04-191-0/+6
| | | | | Change-Id: Ie748b52a93916b332f1e4fa7c6ff04dd6cc30bfa Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix Krazy warnings about includes/header guards in Debugger.Friedemann Kleint2013-03-121-3/+3
| | | | | Change-Id: If547a0002d37710fac58c1a13bacc48cf531bed7 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-271-0/+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-0/+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>
* | Debugger: Rework thread data aquisitionhjk2012-10-231-1/+1
| | | | | | | | | | | | | | | | | | 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-1/+0
| | | | | | | | | | 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-2/+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 parameter guessinghjk2012-08-161-3/+1
| | | | | | | | | 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>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* debugger: merge notifyEngineRemoteSetup* and handleRemoteSetup*hjk2012-06-131-2/+2
| | | | | | Change-Id: I89abcb0dcceef6767cb3e78f4e85c1cd718e78c1 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Merge QML inspector into debugger pluginKai Koehne2012-05-091-1/+1
| | | | | | | | | 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-0/+1
| | | | | Change-Id: I90958e77c4d8c845ef6e55fe65eaffe0ac24dcc5 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Debugging: Pass a DebuggingLanguage arg in executeDebuggerCommand()Aurindam Jana2012-04-101-1/+1
| | | | | Change-Id: I99eedc86c987615072b7400051b61700b98ebab3 Reviewed-by: hjk <qthjk@ovi.com>
* QmlCppDebugger: Fix tool tip expressionAurindam Jana2012-03-301-0/+1
| | | | | Change-Id: I1dd81d87c744b4a7f8bd86ac08d95bc5e63bd17f Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* QmlCppDebugger: Implement notifyInferiorIll()Aurindam Jana2012-02-231-0/+2
| | | | | Change-Id: I6d2091fff62eb0dabceda4da4eb49d2f63f99484 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* ScriptConsole: Refactor to QtMessageLogWindowAurindam Jana2012-02-201-0/+3
| | | | | | | | | | 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>
* Debugger: Simplify handling of requestRemoteSetup in QmlCppEngineKai Koehne2012-01-311-3/+0
| | | | | | | | 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-0/+1
| | | | | Change-Id: Iaa45ff106f5f71a2c7f4729c64c281921b855f80 Reviewed-by: hjk <qthjk@ovi.com>
* debugger: enable forceful abort of mixed qml/cpp enginehjk2012-01-181-0/+1
| | | | | Change-Id: I815f0bf91e8ca58c9e472f81a234834dc341f29d Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlCppEngine: Properly handle requestRemoteSetupCallsKai Koehne2012-01-171-0/+3
| | | | | | | | | Remember which engines called requestRemoteSetup. Change-Id: I75d11a21f0ebcbce1bba0aa4f653d1cc35b43483 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* debugger: replace static capability check by something potentially dynamichjk2012-01-161-1/+1
| | | | | | | This does not yet use the potential. Change-Id: I087311fb7d59b46e49f65a84c4420c72a1227ebb Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlCppEngine: Make sure that breakpoint markers get removedKai Koehne2011-10-131-0/+1
| | | | | | | | | resetLocation() called by DebuggerPlugin::handle* should automatically reset the locations for stepping etc. Change-Id: I3e20f93ade7f40e1e1f33b1b48b11522b59771f8 Task-number: QTCREATORBUG-6291 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Debugger: Show QML Script Console only for QML debuggingAurindam Jana2011-09-221-0/+2
| | | | | | | Change-Id: Ibb0f03c77a84ee8682d44944e8a24fac54cb60fe Reviewed-on: http://codereview.qt-project.org/5329 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* all: less QScopedPointerhjk2011-09-191-3/+1
| | | | | | Change-Id: I536bdb4d4f0c10fa858560f3c160fc0fff8da9b2 Reviewed-on: http://codereview.qt-project.org/5116 Reviewed-by: hjk <qthjk@ovi.com>
* Merge remote-tracking branch 'origin/2.3'Eike Ziller2011-08-101-3/+0
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/libs/libs.pro src/plugins/debugger/watchwindow.cpp src/plugins/remotelinux/maemopackagecreationstep.h Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
| * QmlCpp Debugging: Only set C++ breakpoints after QML is connectedKai Koehne2011-08-041-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If one hits a C++ breakpoint before the QmlEngine is properly set up the debugging actions are all disabled. Patch 58faedc4e tried to fix this by automatically executing continue in these cases, but this let to errors on Mac OS X. Instead just delay the setting of C++ breakpoints. Task-number: QTCREATORBUG-5681 Change-Id: I149dea9b453ed7abd33a1a93b5b546d7c6cda8fd Reviewed-on: http://codereview.qt.nokia.com/2568 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* | Debugger: Replace virtuals by capability flags.Friedemann Kleint2011-08-041-2/+0
|/ | | | | | | Change-Id: If09efd21dc44e356eb575bb6170356fdbd409b39 Reviewed-on: http://codereview.qt.nokia.com/2625 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* QmlCppDebugger: skipping breakpoints before QML debugging is startedChristiaan Janssen2011-07-121-0/+3
| | | | | | | Change-Id: I461488812976284e9f3af1bcea8399f504e150e4 Reviewed-on: http://codereview.qt.nokia.com/1524 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* debugger: split BreakpointIndex into plugin and debugger specific parthjk2011-06-271-1/+1
| | | | | | Change-Id: I21d10cf42eb039c74475e106537b6e107d155196 Reviewed-on: http://codereview.qt.nokia.com/745 Reviewed-by: hjk <qthjk@ovi.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-131-14/+13
|
* QmlDebugger: user input on watchesChristiaan Janssen2011-03-241-0/+2
| | | | Reviewed-by: hjk
* Debugger: Add toolchain combos to start dialogs, refactor detection.Friedemann Kleint2011-02-241-1/+3
| | | | | | | | | | | | | Add combo box listing toolchains with debuggers to start external, attach and core. Another attempt at streamlining engine detection: Split in detection functions that first collect a list of available engines by preference, then remove disabled and wrongly configured engines and use the remaining best. matching. checkconfiguration is now the central place where engine detection and config check takes place. Rubber-stamped-by: hjk
* QmlDebug: Parse application output to track debugees stateKai Koehne2011-02-231-0/+3
| | | | | | | | Setting up the debugger connection might fail for a couple of reasons. Check the application output to show the user a more detailed error message. Reviewed-by: hjk
* debugger: fix 'Jump To/Run to' when in instruction-wise modehjk2011-02-231-2/+2
|
* More copyright fixesTobias Hunger2011-02-181-0/+33
|
* Debugger: Reduce tooltip flicker.Friedemann Kleint2011-02-171-1/+1
| | | | | | | | Move tooltip-request handling from DebuggerPlugin into DebuggerToolTipManager. Request tooltip only if position changed and close standard tooltip on success.
* Debugger: Make tooltips pinnable.Friedemann Kleint2011-02-111-1/+1
| | | | | | | | | | | | Replace old debugger tooltip by a new ToolTipManager which has a list of AbstractDebuggerToolTipWidget with the functionality to 'acquire' an engine (display its data) and 'release' it (store engine data and display them as 'previous') and serialization to XML session data. DebuggerTreeViewToolTipWidget implements AbstractDebuggerToolTipWidget for tree model acting as a filter on watch models. Rubber-stamped-by: hjk
* QmlCppDebugger: frame change now managed by DebuggerEngineChristiaan Janssen2011-02-021-3/+0
| | | | reviewed-by: hjk
* debugger: implement qml->c++ cross-steppinghjk2011-01-191-1/+1
|
* debugger: first shot at combined cpp/qml steppinghjk2011-01-141-0/+2
|
* debugger: re-do state transitions in combined C++/Qml enginehjk2011-01-141-61/+58
| | | | This still needs a lot of work and sanitizing.
* debugger: prepare qmlcppengine state fixhjk2011-01-141-11/+4
|
View Lorry Controller Status