summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/script/scriptengine.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove script manager and script debugger engine.Eike Ziller2013-07-011-815/+0
| | | | | | | | | Doesn't really serve a purpose any more. Change-Id: I8c3bc11bf7b05a15eafd2a22456a40b270cefadf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: hjk <hjk121@nokiamail.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>
* | Debugger: split editor related code off watchutils.{h,cpp}hjk2013-01-251-0/+1
| | | | | | | | | | | | | | | | This is now in sourceutils.{h,cpp} to make watchutils.{h,cpp} better acessible to the debugger auto-tests. Change-Id: Ie87e715bc7018ca190a460c37dfd19bc897059f0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/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>
* | Add whitespace after control keywordsOrgad Shaneh2012-11-281-1/+1
| | | | | | | | | | | | | | | | find -name \*.cpp -o -name \*.h | \ xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g' Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390 Reviewed-by: hjk <qthjk@ovi.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>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@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: don't store active languages twicehjk2012-08-151-1/+1
| | | | | Change-Id: I6517b42b4cfd0d2d919fa2971c3ea0995443cbf3 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: rework WatchModelhjk2012-05-241-5/+2
| | | | | | | | | | | 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>
* Debugging: Pass a DebuggingLanguage arg in executeDebuggerCommand()Aurindam Jana2012-04-101-1/+2
| | | | | Change-Id: I99eedc86c987615072b7400051b61700b98ebab3 Reviewed-by: hjk <qthjk@ovi.com>
* UI text: end messages in a full stopLeena Miettinen2012-03-051-3/+3
| | | | | Change-Id: Ia70f4859b5cfe4435a4119a3b6b74dca625c26a8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-201-2/+2
| | | | | | | | And adapt the other API respectively. Change-Id: I1e04e555409be09242db6890f9e013396f83aeed Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-17/+17
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Use new static ICore interface.hjk2012-01-241-1/+1
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@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>
* Debugger: Expose which languages (QML, C++, Any) an engine supportsKai Koehne2011-10-131-1/+1
| | | | | Change-Id: Ia690b5cda84738c303ae7b6bd579e43313728525 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* New QTC_CHECK warning replacing QTC_ASSERT(x, /**/)Kai Koehne2011-07-291-1/+1
| | | | | | | | | Warn if the condition fails, but otherwise don't change the execution flow. Change-Id: Id7b14c745109b66960add967b2a4ef8d31e1a546 Reviewed-on: http://codereview.qt.nokia.com/2389 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* debugger: split BreakpointIndex into plugin and debugger specific parthjk2011-06-271-2/+2
| | | | | | 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
|
* debugger: fix 'Jump To/Run to' when in instruction-wise modehjk2011-02-231-6/+4
|
* Debugger: Reduce tooltip flicker.Friedemann Kleint2011-02-171-8/+9
| | | | | | | | 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-3/+3
| | | | | | | | | | | | 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
* debugger: switch do fkleint's style of debug output enablinghjk2011-01-251-8/+5
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* Debugger: Header cleanupFriedemann Kleint2011-01-101-0/+1
|
* Merge branch '2.1'con2010-12-171-7/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/basemode.cpp src/plugins/coreplugin/basemode.h src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp src/plugins/debugger/debuggeragents.cpp src/plugins/debugger/debuggeruiswitcher.cpp src/plugins/debugger/debuggeruiswitcher.h src/plugins/projectexplorer/buildconfigdialog.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.h src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h src/plugins/qmldesigner/designercore/include/modelutilities.h src/plugins/qmldesigner/designercore/include/nodeinstance.h src/plugins/qmldesigner/designercore/include/propertymetainfo.h src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp src/plugins/qmldesigner/designercore/model/modelutilities.cpp src/plugins/snippets/inputwidget.cpp src/plugins/snippets/snippetscompletion.cpp src/plugins/snippets/snippetscompletion.h src/plugins/snippets/snippetspec.cpp src/plugins/snippets/snippetsplugin.cpp src/plugins/snippets/snippetswindow.cpp src/plugins/snippets/snippetswindow.h src/plugins/texteditor/snippetsparser.cpp src/tools/qml/qmldom/main.cpp tests/manual/trk/runner.cpp tests/manual/trk/trkolddevice.cpp tests/manual/trk/trkolddevice.h tests/manual/trk/trkserver.cpp
| * License headers.con2010-12-171-7/+11
| |
* | debugger: introduce the concept of a 'Location', used by gotoLocationhjk2010-12-171-5/+1
| |
* | debugger: make DebuggerEngine::acceptsBreakpoint(id) purehjk2010-11-261-0/+6
| |
* | debugger: start tightening the breakpoint state machineryhjk2010-11-161-1/+1
| |
* | Debugger: Introduce BreakpointParameters as base struct.Friedemann Kleint2010-11-151-3/+3
| | | | | | | | | | | | For Breakpoint data manipulation. Reviewed-by: hjk
* | debugger: Refactor breakpoint handling.hjk2010-11-151-40/+16
| | | | | | | | | | | | | | | | | | | | | | The breakpoints are now (fairly) tightly guarded by the BreakpointHandler. Engines and Views are only supposed to refer to them by id. They also have individual states now. The breakpoint data is split into a "user requested" "fixed" part in BreakpointData and the engines' acknowledged data in a new struct BreakpointResponse. TODO: Move m_state and m_engine members to BreakpointResponse. Fix regressions in the marker handling.
* | Clean up BreakPointArvid Ephraim Picciani2010-10-291-1/+1
| | | | | | | | | | Reviewed-by: Friedemann Kleint Reviewed-by: hjk
* | clean up WatchDataArvid Ephraim Picciani2010-10-151-5/+8
|/ | | | Reviewed-by: hjk
* Debugger: Fixes around watch editing.Friedemann Kleint2010-09-231-4/+4
| | | | | | | | | | | | | | | | | | assignValueInDebugger: Pass on WatchData as well, pass on values as QVariant. Based on that, do more extensive checks in CDB, preventing assignment of non-PODs. Locals/Watch editing: * Disable while running * Edit pointer values as hex with validation. CDB: Strip class types off reported pointer values and reformat the values as short 0x-pointer values, introduce flag to WatchData::source to do dumper expansion handling. Windows: recognize int64 as int. Register handler: Fix accessing uninitialized value.
* Debugger: Sanitize Datatypes, part 1: Breakpoints.Friedemann Kleint2010-09-211-3/+3
| | | | | | Make address a quint64, linnumber and ignoreCounts int. Reviewed-by: hjk
* debugger: fix warninghjk2010-09-131-0/+1
|
* debugger: only update variables that are operated onhjk2010-09-131-1/+1
|
* debugger: make a 'type' a QByteArray, not a QStringhjk2010-09-011-15/+15
| | | | Saves lots of conversion.
* Debugger: Fix Symbian.Friedemann Kleint2010-08-241-0/+1
| | | | | | | | | | ...which subclasses DebuggerRunner and does not call DebuggerPlugin::startDebugger(), which connects the engine, leading to strange malfunctions. Move functionality to DebuggerRunner::start() to make it self-contained. Add object names to engines for easier debugging. Reviewed-by: hjk
* debugger: make parts of python debugger work again with the new stateshjk2010-07-231-3/+4
|
* debugger: show a message box when the script engine does not find its ↵hjk2010-07-221-3/+5
| | | | primary file
* debugger: overhaul "state machine"hjk2010-07-141-65/+88
| | | | | This mainly allows for more precise shutdown and tightens the set of allowed transitions.
* debugger: rename EngineStart to EngineSetuphjk2010-07-141-3/+3
|
* debugger: refactor startup logichjk2010-07-141-10/+14
|