Commit Graph

347 Commits

Author SHA1 Message Date
Ryan May
45cd2d1e8f Debugger: Set current tab in separate value display
As widgets are added and deleted from the tab widget, they can end
up in almost any order. As a result, when the window is raised, the
current tab does not necessarily reflect an item currently in the
watch view. Instead, make a tab the current one as it is added,
ensuring one of the currently relevant values is displayed by default.

Change-Id: Ia2d2eb60c844a008f8086820564dd20389ce519b
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-29 13:09:03 +01:00
Friedemann Kleint
82b781f5a7 Auto-detect Endianess of image data by looking at width value.
Change-Id: I403fe7dcf841129e4c24b2c2787f58aa94540c6e
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-28 19:25:42 +01:00
Friedemann Kleint
7bc0818d7a Fixes to edit format handling.
- Close window after last tab has been removed.
- Remove type name from tab title (results in too-long tab titles
  for templates).

Change-Id: If4b55423261ed4992b8a7e983704006fdda86843
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-28 19:21:30 +01:00
Friedemann Kleint
a9ea71c26f Use switch in showEditValue().
Change-Id: I37c628ea18663eb8fec5351e3b2d580617ff7c35
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-14 12:59:13 +01:00
Friedemann Kleint
224eaa817a Fix separate window for Utf8 strings.
Change-Id: Ibb355923f71a9c9a387edecb8e67760561b13117
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-14 11:12:18 +01:00
Friedemann Kleint
fe6be533bc Debugger: Add a tab widget for separate value display.
Debugger display in separate windows currently opens several
widgets without title at the same location that disappear
below the main window when stepping.

Put them in a tabwidget and raise it when setting new values.

Task-number: QTCREATORBUG-8344
Change-Id: Icb6dd8942ab851aeeb6a9248c4a1360e8841cf61
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-13 15:19:21 +01:00
Eike Ziller
387f5a7006 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
2012-11-26 10:52:28 +01:00
Aurindam Jana
32a0afb9df Inspector: Fetch objects lazily
QML objects are fetched lazily when constructing the object tree.
Incase parents have not been previously fetched, we fetch the
required data to construct only the relevant branch of the tree.

Task-number: QTCREATORBUG-8246
Change-Id: Id529c3b2334d33ff4eb46b14f50cf042ad2960e2
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-24 22:51:19 +01:00
Eike Ziller
3e7d94c362 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824
2012-11-16 15:31:02 +01:00
Aurindam Jana
bc5cda03e4 Inspector: Do not disable Locals and Expressions
Inspector follows a different cycle and its contents are
always valid during a debug session. Show the values in
Locals and Expressions as valid for user to interact
with them.

Task-number: QTCREATORBUG-8167

Change-Id: If2f622de5b8bf6da78571bc007efd19602a5f389
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-11-09 16:23:12 +01:00
Orgad Shaneh
caade07b8c Debugger: Fix warning
Change-Id: Ifb44512a99d7a08eed9631b94075ca6c096a378b
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-31 15:02:32 +01:00
Eike Ziller
67b0637934 Merge remote-tracking branch 'origin/2.6' 2012-10-29 15:13:06 +01:00
Friedemann Kleint
0ae5695649 Try to watch local variable in watchwindow-DND, too.
Fix codepath overlooked in
6886e485de by introducing
a WatchHandler::watchVariable().

Task-number: QTCREATORBUG-8120
Change-Id: Ibab2619754e0006f3c81810a6bfdf758261c169e
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-29 13:29:56 +01:00
Eike Ziller
720cb9f35e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/ssh/sshconnection.cpp

Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
2012-10-11 21:11:40 +02:00
Aurindam Jana
388a21c826 QmlDebugger: Insert locals correctly
The watchhandler needs to be reset for locals before
inserting the values of a new frame. Also the DebuggerTooltipManager
needs to be notified. The values of the locals in the
LocalsAndExpressions window should be editable.

Task-number: QTCREATORBUG-7992
Change-Id: I556e23b408db09b510f1f2bc350ff55187ec87c2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2012-10-10 16:55:07 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
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
2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
hjk
009c3f1a26 debugger: use symbolic constants for "Display in Seperate Window" modes
Change-Id: Iab2b918e94abddb1fb4132c27e0b5f29810d4598
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-05 08:12:26 +02:00
hjk
b3c6f7be3f debugger: make QByteArray displayable in separate window
Change-Id: I6ec1e880e1c82415361545f57115353d843ee7f3
(cherry picked from commit ce381a81cf03bb122a9ce4102fbbb56825ce05e3)
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-04 15:16:58 +02:00
hjk
aa8602e1e8 debugger: fix color for changed items in locals and expressions view
Change-Id: I93905f8e97e2738590fecf41ac7294c2f6872335
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-21 17:48:31 +02:00
hjk
00f7677fc4 debugger: fix "Display in Separate Window" for QString
This is fixing a regression introduced recently during the
WatchModel rework.

Change-Id: I128368e78d00f1ef1fc96f7319b19873099396fa
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-07 15:02:00 +02:00
Friedemann Kleint
6886e485de Handle watching/tooltips of C++ editor tokens consistently.
For editor tooltips and the editor context menu
'Watch expression', always try to find a local variable first
and use its expression.

Change the tooltip manager/widgets not to rely on the debugger
model enum and obscure expression, filter by complete iname
instead. Remove obsolete enumeration.

Change gdb's handling of tooltips such that local variables
are displayed immediately without creating additional tooltip
items.

Change-Id: I9b55823428029ba50d84d3a8cab55eb58942e72b
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 09:02:56 +02:00
Friedemann Kleint
5b69bee198 Use QT_NO_CAST_FROM_ASCII for debugger plugin.
Fix gdmi escape routine by using a traits class to adapt
QByteArray/QString.

Change-Id: Ic6d2a0c927e4613aec9f69095bbb04a393e9edb9
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 09:46:25 +02:00
Friedemann Kleint
2f51579fe4 Debugger: Fix string usages.
- Compile with QT_NO_CAST_FROM_ASCII.
- Remove single character string constants.

Change-Id: Icece98619b6c30e047d3fce00e6ae74bbcd53c67
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-22 12:24:24 +02:00
Friedemann Kleint
a31e8b446e CDB: Pass referenced address in separate GDBMI field.
Use 'origaddr' as gdb does. Do not append address to watch value
if it is already contained in the value.
Fixes the currently grayed-out 'Open memory editor at referenced
address'.

Change-Id: I6f7cf5b7984f93606ad4bb0872348f51c73f9117
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-21 13:55:54 +02:00
hjk
ebc63659c1 debugger: apply custom type display settings also to references
Since a reference is "the same thing" it does not make sense
to offer different choices of displays.

Change-Id: Id9ee31b6f1a8fcc9ff3a523a055017e781249d18
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 23:41:39 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Friedemann Kleint
7eb8a08c0b Debugger: Fix compile on Windows.
Change-Id: I4994fdfd260d80eec8a0bfda903c553d2d563706
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-31 16:38:59 +02:00
hjk
788772a23e debugger: work on watchmodel bulk insert
Change-Id: Ib92c8b02bc8e608810b3fa0f2d70d6547e428933
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-31 14:33:44 +02:00
hjk
f5c688cadc debugger: save a few cycles in the watchmodel
Change-Id: I56afd567361b2a65db4e0103a64540dc4305981c
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-31 14:30:07 +02:00
Aurindam Jana
a79e38ac6f QmlJSInspector: Set property values
QML property values could be set in the inspector.
Regression introduced by 7f09d0b756.
This patch is a partial fix. Only values can be assigned currently.
For expressions, use the console.

Change-Id: I945b11109cd7788dd0f5277af206bf9658844aee
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-25 11:20:49 +02:00
hjk
557c73adfb debugger: prevent watched expressions from re-appearing
Task-number: QTCREATORBUG-7408
Change-Id: I2936aff74b629b6d58cbcd09e023346dabdf191f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-25 08:26:57 +02:00
hjk
cc6a3b4fd7 debugger: fix regression when trying to remove watched expressions
Change-Id: I0d12339ab1903dc78eec699e07fc0c17daab0e5d
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-24 16:25:49 +02:00
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