Commit Graph

168 Commits

Author SHA1 Message Date
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +01:00
Harald Fernengel
f9623b5ad6 Small include header fixes
QtXmlStream classes live in QtCore, not QtXml. Also add a few headers
that are not implicitly included in Qt 5 any more. This greatly eases
transition to Qt 5 which not having any side effects on the Qt 4 build.

Change-Id: I1293ef4360015b885dcea8c4099e8e5b9e254c91
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-11-09 14:02:40 +01:00
hjk
4f522b92ef debugger: add dialog to edit display types
Change-Id: If1ea8cdab359bcad80e37dd4a932e4b586527264
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-08 11:51:49 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
hjk
2e9fd40d86 debugger: use common baseclass for all dock treeviews
Reduces amount of boilerplate code.

Change-Id: I048d901b4b80860df05f09b48650ea58b83fbc66
Reviewed-on: http://codereview.qt-project.org/5864
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-30 12:31:29 +02:00
hjk
d8c8603a32 debugger: Fix context menu behavior for evaluated expression children
Task-number: QTCREATORBUG-5920
Change-Id: I5e215fd1df9596deb3b821764806f1db65096572
Reviewed-on: http://codereview.qt.nokia.com/3610
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-25 17:38:02 +02:00
hjk
e3849b5ebd debugger: Remove All Watch Items -> Remove All Evaluated Expressions
Task-number: QTCREATORBUG-5919
Change-Id: I49288a500e5771a3f6489ce993bd7b00b3176e50
Reviewed-on: http://codereview.qt.nokia.com/3582
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-25 11:43:23 +02:00
Friedemann Kleint
f76da43b05 Debugger: Replace virtuals by capability flags.
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>
2011-08-04 14:35:18 +02:00
hjk
79d604667b debugger: offer an option to show C-style escaped strings
Task-number: QTCREATORBUG-5667
Change-Id: I1c48fb19ece055c0b3a4b29ccee063cbce06f525
Reviewed-on: http://codereview.qt.nokia.com/2582
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-03 17:06:23 +02:00
hjk
14320ad4f4 debugger: code/ui cosmetics
Change-Id: Iafd3388bc04d5ffb6d080a1a2b28b55bb8c98a05
Reviewed-on: http://codereview.qt.nokia.com/2564
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-03 13:30:36 +02:00
hjk
9f82bc25a4 debugger: allow insertion of evaluated expressions for core files
Task-number: QTCREATORBUG-5693
Change-Id: I8b6a5e0cd7956dab92270cae8994da3303fcf8e9
Reviewed-on: http://codereview.qt.nokia.com/2558
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-03 12:41:35 +02:00
Friedemann Kleint
a1ffc4a19f Debugger: Fix crash in stack frame layout display.
The option is also enabled when the index is invalid.

Task-number: QTCREATORBUG-5650
Change-Id: If1efb900d29724e5c43db1589c797197fae67bd2
Reviewed-on: http://codereview.qt.nokia.com/2342
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-07-28 15:04:10 +02:00
Jarek Kobus
5418a137dd Fix original string messages
Change-Id: Icc7819585a8382a02b02a28f39dcea8ec1c6a7e6
Reviewed-on: http://codereview.qt.nokia.com/1142
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-07-05 12:10:50 +02:00
hjk
c041286753 debugger: split BreakpointIndex into plugin and debugger specific part
Change-Id: I21d10cf42eb039c74475e106537b6e107d155196
Reviewed-on: http://codereview.qt.nokia.com/745
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-27 09:14:25 +02:00
hjk
9e231e4407 debugger: fix expansion of object in gdb tooltips on first click
Change-Id: Ia157f8fb7f1b9ff8a8161c8a726d1d483b81e54f
Reviewed-on: http://codereview.qt.nokia.com/179
Reviewed-by: hjk <qthjk@ovi.com>
2011-05-27 12:22:06 +02:00
hjk
fb7f576ede debuggger: allow change of display for templated types 2011-05-17 12:59:54 +02:00
hjk
e8496ca33f debugger: work on watchpoints (or, "data breakpoints" as they are called now) 2011-05-10 15:58:11 +02:00
Friedemann Kleint
ddf4b613f3 Krazy fixes (spelling, single char strings, char constants). 2011-05-10 15:21:41 +02:00
hjk
c620749b95 debugger: introduce watchpoint-by-expression 2011-05-09 09:04:55 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Friedemann Kleint
2e1954ae47 Debugger: Pre-set memory address dialog in locals view. 2011-05-04 15:08:43 +02:00
dt_
a7c4bec491 Fix warning in watchwindow.cpp
Reviewed-By: Friedemann Kleint
2011-04-27 14:45:30 +02:00
Friedemann Kleint
1ae9679c40 Debugger: Separate internal constants. 2011-04-21 15:52:51 +02:00
Friedemann Kleint
7fd3787616 Debugger: Enable Stack Layout action in white area, too. 2011-04-21 15:34:19 +02:00
Friedemann Kleint
bbe9c6c023 Debugger/Stack layout view: Exclude Dereferenced Pointers.
by WatchData::referencingAddress as they are outside
the address range.
2011-04-21 13:39:40 +02:00
Friedemann Kleint
6484c14ab4 Debugger: Improve register check for memory layout. 2011-04-21 13:05:04 +02:00
Friedemann Kleint
b0da6a1e6c Debugger: Add option to show the stack memory layout.
Show all variables. Mark registers as well in variable memory view
(showing stack pointers, etc).
2011-04-21 12:32:36 +02:00
Friedemann Kleint
5e5e533764 Debugger: Fix up titles/tooltips of memory views. 2011-04-21 09:10:31 +02:00
Friedemann Kleint
ed30a3f724 Debugger: Use bin editor widget for standalone-memory views.
Remove MemoryViewWidget/RegisterMemoryViewWidget
in favour of MemoryView/RegisterMemoryView based on the bin
editor widget.
2011-04-19 12:19:23 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2'
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
e7d09866a2 Debugger: Add action to copy watch value to clipboard. 2011-04-12 16:17:19 +02:00
Friedemann Kleint
fc2e7263d5 Debugger/MemoryView: Recurse over children.
Color all available children if available instead of just
first order children. Remove member variable struct and
pass range vector representing area directly to recursion.
2011-04-12 15:43:00 +02:00
Friedemann Kleint
f3cc061dbe Debugger: Add memory views.
Add a separate memory view tool window available
from the context menus of:

Locals view:
   If the debugger provides size information, colors the
   areas of member variables for inspecting class layouts.

Registers view:
   Tracks the area pointed to by a register.

The view has a context menu allowing to open subviews
referenced by the pointer at the location using
the toolchain abi's word with/endianness.

Rubber-stamped-by: hjk
2011-04-08 16:22:56 +02:00
hjk
edd160779b debugger: switch order of item and type specific entries in l&w context menu
On Mr B.'s request.
2011-04-06 18:40:32 +02:00
Friedemann Kleint
122f6a1845 Debugger: Add size to watch data.
Have CDB report it, pass it on to adding watches.
2011-04-04 16:15:03 +02:00
hjk
f2fe84b7c4 debugger: change layout of the "Change Display Format..." context submenu 2011-03-24 14:43:42 +01:00
Christiaan Janssen
7100d29f66 QmlDebugger: user input on watches
Reviewed-by: hjk
2011-03-24 13:21:30 +01:00
hjk
b1d255efeb debugger: fix removal of dummy <Edit> watch item using the <Del> key 2011-03-17 19:37:07 +01:00
hjk
82b7e9befd debugger: persist 'AlwaysAdjust*ColumnWidths' settings
Task-number: QTCREATORBUG-2836
2011-03-16 18:49:01 +01:00
Friedemann Kleint
6c15cbbee9 Debugger: Enable updates in watchwindow when changing model.
Might be left in disabled state in case engine binary crashes
while expanding locals.

Task-number: QTCREATORBUG-3099
2011-03-03 10:39:05 +01:00
hjk
2780ff6f22 debugger: refactor watch point lookup
In preparation of bitfield watch points.
2011-03-01 19:17:03 +01:00
Friedemann Kleint
cbafc50acc Debugger: Make tooltips use standard text editor tooltips.
Extend text editor tooltips by a 'widget content', making
it possible to show any widget utilizing the fact that the
QTipLabel actually is a frame (and thus a container).
Introduce concept of 'interactive' tooltips and modify
the tooltip-closing mechanism such that simple interaction
is possible. Emit the base text editor's tooltip signals
with the correct position and add API to calculate the tooltip
position from the cursor position.
Add API for pinning tooltips to the text editor (by removing
them from the QTipLabel layout).
Modify the Debugger's tooltipmanager not to manage tooltips
under TextEditor control and to take over control only once
tooltips are pinned.

Rubber-stamped-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-02-21 16:51:00 +01:00
hjk
98c4b82c2d debugger: make output format of non-printable characters customizable 2011-02-17 19:01:07 +01:00
hjk
0d4ef2939f debugger: remove obstructing frame around l&w item delegates 2011-02-17 16:32:50 +01:00
Friedemann Kleint
cae3037df4 Debugger: Add functionality for copying watch data to clipboard.
in watch window and tooltips.
2011-02-14 09:40:43 +01:00
Friedemann Kleint
7bae5dd556 Debugger: Fix action to remove all watch items. 2011-01-17 09:12:37 +01:00
Friedemann Kleint
2f6a86d6a5 Debugger: Add some menu actions.
- Windows: Inspect a module by running depends.
- Clear all watches.
2011-01-14 17:28:37 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1'
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
2010-12-17 17:00:53 +01:00