Commit Graph

314 Commits

Author SHA1 Message Date
hjk
e11a3a7697 debugger: rework WatchModel
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>
2012-05-24 14:33:34 +02:00
Aurindam Jana
9eb539469d WatchHandler: Add isInspect()
Change-Id: I237f77554a06bf7c139a8ae5cfef79c6fb4c8507
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-15 11:35:20 +02:00
Kai Koehne
33ec5eb246 Debugger: Rename actions dealing with watched expressions
Unify naming: Expressions are added/removed inside an "Expression Evaluator".

Task-number: QTCREATORBUG-7308
Change-Id: I47c8f7bee3673fe8378fab7977d8b57e5e4ad1c1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-05-14 16:13:14 +02:00
Kai Koehne
7f09d0b756 Merge QML inspector into debugger plugin
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>
2012-05-09 12:42:44 +02:00
hjk
a872c91c64 debugger: enable memory editor for referenced address
Task-number: QTCREATORBUG-7318
Change-Id: I2cb422c9e798ae3dd1babcff25c623f086f916f8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-03 13:00:09 +02:00
hjk
5b0bf61640 qtcassert: move actual printing to separate function and enforce style
This also allows simple setting of breakpoints on failed asserts.

Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-17 09:53:44 +02:00
hjk
65b8b14b7c debugger: add missing 'type' column when copying watch contents
Change-Id: I5303814f38deba238120e57ebaad765ab089704c
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-16 12:58:43 +01:00
hjk
02da7db7e1 debugger: show the returned value as 'returned value', not $23
Task-number: QTCREATORBUG-6894
Change-Id: Ia5d666f2f403eddbbf027a0ac7ac5a708e2425c1
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-14 13:40:46 +01:00
hjk
d014c2ca4b debugger: remember format settings also for individual variables
Task-number: QTCREATORBUG-6944
Change-Id: I98c803e64a6a1ac2c07a0d0b0f31c6d7756faffc
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-14 12:27:38 +01:00
hjk
273d823e6b debugger: fix red foreground color for changed values
Change-Id: Ib170199739bad3b193ddee077ff857a96f259f49
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-13 16:32:58 +01:00
hjk
5a3473fe96 debugger: unbreak display of non-7bit-clean data
Task-number: QTCREATORBUG-7086
Change-Id: Ia38c27b66dcd98b84c09bb0dc50bd2cd19470400
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-13 10:52:22 +01:00
hjk
f17184bcd2 debugger: make tooltips non-editable
Task-number: QTCREATORBUG-7028
Change-Id: I8b70435df8b958961204f8498f63b0752a6ad0bf
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 10:01:27 +01:00
Denis Mingulov
87b1dc25a1 Debugger: use QString::fromLatin1 instead of QString::fromAscii
By source - latin1 is really expected as there is no any check
or usage of QTextCodec::setCodecForCStrings() currently.

QString::fromAscii() might break 'Latin1' input in some cases.

A quote from documentation about QString::fromAscii():

"Note that, despite the name, this function actually uses the
codec defined by QTextCodec::setCodecForCStrings() to convert str
to Unicode. Depending on the codec, it may not accept valid
US-ASCII (ANSI X3.4-1986) input. If no codec has been set, this
function does the same as fromLatin1()."

Change-Id: I49cf047ca674d2ec621b517c635d1927bb2e796f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-16 10:27:04 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
hjk
7e9e3a816f debugger: display bool values as 'true' or 'false' when appropriate
Change-Id: Ic453ec79c353beef04c67c9d47f8436b0a119243
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-08 14:43:34 +01:00
hjk
9c57b1000f debugger: Do not display empty tooltips
Task-number: QTCREATORBUG-6893
Change-Id: Idb780e97c23f6cc5d1bcede149959b2e58f9eaa2
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-07 15:48:42 +01:00
Daniel Molkentin
b44e541dca bugreports.qt.nokia.com -> bugreports.qt-project.org
Change-Id: Ifc258886f7d6e7d5b02caae8994210aeef221554
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-01-26 19:58:08 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
8e3b9d38e8 debugger: do not disable updates on locals and expressions
Task-number: QTCREATORBUG-5474
Change-Id: I6a2e872ac64a6ae57ff1ee9618937f0752fbb4ed
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-20 11:22:46 +01:00
hjk
fa26b986de debugger: fix recent regression of non-persistent expanded watch items
Change-Id: Iec8b37812faca5584d268712181ffeca98ef6e8a
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 15:20:28 +01:00
hjk
334b7cb426 debugger: don't allow L&E expansion while inferior runs
Change-Id: I1179f2b3b0f1e0099e5ab2a30b09e1216cd68fd7
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-17 18:52:40 +01:00
hjk
183769e7ef debugger: grey out Locals&Expressions when not accessible
Change-Id: I61489b9a5bf117be154ed6899beb3f8294247c9e
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-17 18:52:30 +01:00
hjk
3d39451b15 debugger: show address of the target object when auto-dereferencing
Task-number: QTCREATORBUG-6813
Change-Id: Iaf1436a41cd22f46e8a8c369f942a3dba127cc6e
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-16 18:53:40 +01:00
hjk
496e9fafd0 debugger: replace static capability check by something potentially dynamic
This does not yet use the potential.

Change-Id: I087311fb7d59b46e49f65a84c4420c72a1227ebb
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-01-16 16:33:43 +01:00
hjk
e29a325409 debugger: also translate special strings when editing values in L&E
Task-number: QTCREATORBUG-5839
Change-Id: I5720a679d2ef29cf870e12760964525bec141d0e
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-12 16:05:36 +01:00
Friedemann Kleint
a92e38f47f Debugger: Compile with QT_NO_CAST_FROM_ASCII.
(except gdbmi.cpp, name_demangler.cpp). Remove some unneeded
conversions, change some maps to take QByteArray keys.

Change-Id: I010f1251998a441fe5c8c87901b1e0c277c0391c
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-21 14:07:12 +01:00
hjk
844437c666 debugger: use the same type formats for arrays of same base type
Task-number: QTCREATORBUG-5582
Change-Id: I690c755fc5d2ea127ea12f65f799accb10ff20c9
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-30 16:04:24 +01:00
hjk
add5c8cb7a debugger: test the data that ends up displayed, not the raw data
Change-Id: I9453abd43299416e8d8535f9567fe96ff976e413
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-25 18:53:02 +01:00
Eike Ziller
e2b0835b58 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
2011-11-25 09:48:25 +01:00
hjk
3a210a19c9 debugger: immediate refresh after toggling sort order of struct members
Change-Id: Iac7de58ca8681a60a4b6c9d0e717eb57753898b5
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-24 18:15:54 +01:00
hjk
06f53a4e25 debugger: don't try to escape translated strings
Task-number: QTCREATORBUG-5838
Change-Id: I897af2919d3762c23c788d276e755d8d598483ed
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-24 10:33:50 +01:00
hjk
0e0b356bd7 debugger: show vtable ptr in hex, also with gdb
Task-number: QTCREATORBUG-6109
Change-Id: I9df2ddcd47e3551b23af20d2199b45fbee34bf9f
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-11 17:54:13 +01:00
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
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
384a8ed1cf debugger: don't store empty watched expressions
Change-Id: I3aa6ae756557c86caed7860bd0ffb26dced35bdc
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-02 08:29:10 +01:00
hjk
7ed1064971 debugger: fix "unexpected" state changes when aborting the debugger
Change-Id: Icec2e3333eb019c51ab32e7bb10887dec1ce9e16
Reviewed-by: hjk <qthjk@ovi.com>
2011-10-31 16:19:17 +01:00
Aurindam Jana
71dfe61c88 WatchHandler: Init WatchCounter correctly.
Change-Id: Ief2078b0109c1152d34519869d0e0972bd01ed3c
Reviewed-by: hjk <qthjk@ovi.com>
2011-10-31 16:06:13 +01:00
Aurindam Jana
ef47a40570 WatchHandler: Fix warnings
Change-Id: I877a78b48e7b5c0abb30db6661b9e1986be61b47
Reviewed-on: http://codereview.qt-project.org/4659
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-12 14:31:28 +02:00
Aurindam Jana
84364b7884 WatchHandler: Move generationCounter to individual WatchModels
Change-Id: I39cdd48ed02cbcf6702076245c765cb6c8926c1b
Reviewed-on: http://codereview.qt-project.org/4429
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-08 13:42:18 +02:00
hjk
8d936cec6e debugger: speed up QDate, QTime, QDateTime dumpers
Change-Id: I9ed3961d047738bd3add87b1f00d548df1fb01d8
Reviewed-on: http://codereview.qt.nokia.com/3609
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-25 17:37:41 +02:00
hjk
53453a2380 debugger: centralize check for changed display entries
Change-Id: I22c58812990925102aeeb80571bb877fd0a2924b
Reviewed-on: http://codereview.qt.nokia.com/3330
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-22 18:24:38 +02:00
Robert Loehning
476338a6d2 Changed links to bugtracker to https
Change-Id: I62aa9a4033399ee7fc0b55952613657f124c8fb9
Reviewed-on: http://codereview.qt.nokia.com/2791
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-08-10 13:44:03 +02:00
hjk
e0a667067b debugger: show va_list in hex
Task-number: QTCREATORBUG-5608
Change-Id: Ia0e741cd7ceb9f3a247468ceca10af0c728338a5
Reviewed-on: http://codereview.qt.nokia.com/2638
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-04 17:15:11 +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
2ce13e520d debugger: saner handling of unprintable chars in Locals&Expressions
Change-Id: Ia257356ec297dfa7766354d92538886ba2492b55
Reviewed-on: http://codereview.qt.nokia.com/2566
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-03 14:38:10 +02:00
Oswald Buddenhagen
65c0eb5165 Merge branch '2.3'
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
2011-07-29 17:57:59 +02:00
Kai Koehne
1757228278 New QTC_CHECK warning replacing QTC_ASSERT(x, /**/)
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>
2011-07-29 12:19:11 +02:00
Oswald Buddenhagen
ae8ac2eb2f Merge branch '2.3'
Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
2011-07-25 13:57:13 +02:00