Commit Graph

202 Commits

Author SHA1 Message Date
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Nikolai Kosjar
ed86a7ca58 Get rid of some Q_WS_X11.
This macro isn't defined in Qt5 anymore, so use Q_OS_* where
appropriate.

Regarding bug QTCREATORBUG-7936:
Now the fonts look normal again on GNU/Linux, e.g. in the text editor
and the application/compile output pane.

Task-number: QTCREATORBUG-7936
Change-Id: I501cca608f273789d095e1138b32c2c8c38b0059
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-04 08:00:26 +02:00
hjk
422eee2938 debugger: handle "bad" characters when d&d'ing new watchers
Change-Id: I9847a1e22d9dc384658972c1462c4f6d42654daa
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-21 23:25:50 +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
5bbaef6b10 Debugger: Fix stack layout display.
Do not start at model root, since an additional layer
has been introduced. The check for root level in the recursion
is then no longer required.

Change-Id: I22c83b3eb4c07dacc3b5af45edeb340a02c01e3e
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-21 16:27:59 +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
hjk
48fcfe0b8d debugger: move watchpoint convenience functions to breakhandler
Change-Id: I7f214ff5fe6d996c4dd14c6ac181a482ad00c94e
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-04 00:14:41 +02:00
Kai Koehne
b2f4679c20 Debugger: Remove 'Change Global Display Formats...'
Remove 'Change Global Display Formats...' from the Locals & Expressions
context menu. The dialog only works right now if one is currently debugging,
changes are not stored across runs ...

Change-Id: I7d16a7f8eaa9990e5fe1d7148022aa3db2c0fd05
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-01 13:42:20 +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
Kai Koehne
8e2d5e5d72 Debugger: Enable 'Select Widget ...' only if one can add expression evaluators
Change-Id: Ie515e3d318137206f4f60021d7f154c370b83932
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-18 17:47:08 +02:00
Kai Koehne
0fea030cf4 Debugger: Show 'Remove expression evaluator' actions only for watches
Change-Id: I481ec7ff450cb250e9c3ad7718f56f223f65dbcb
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-16 13:50:29 +02:00
Kai Koehne
dd189d0787 Debugger: Remove 'Clear Code Model' context menu action
The use case of this action (introduced in 25ee70bb24) is unclear.

Change-Id: I5188d5c8c9b06c5e2663e2ddc4c89ef1e670d891
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-15 11:54:02 +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
02973b9681 Debugger: Move std:: Qt namespace actions to options
Rename 'Debugging Helper' options pane to 'Locals & Expressions',
and move the two actions for showing/hiding std:: and Qt namespaces
in type name to the page.

Change-Id: If7ec66016b330a4c579597bcc81f1fa5a3eff815
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-14 15:27:24 +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
b5a0ac300f debugger: do nothing if the L&E context menu is cancelled
Task-number: QTCREATORBUG-7319
Change-Id: I9eb9c3612498af37cb9a8787a25939c96637882f
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-27 13:42:52 +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
47fea30557 debugger: rework the searchable view
This reverts most of commit 32ec60958d
and keeps the tree widgets fully accessible.

Change-Id: I34422c175bc43261bb8fe48e0130acb71cdfd721
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-29 17:01:31 +02:00
hjk
32ec60958d debugger: make views searchable
Change-Id: Icade50bfaa884d88e451e688acf62d6793346628
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-22 12:59:42 +01:00
hjk
1c2272772e debugger: better display of the "local format follows type" option
Task-number: QTCREATORBUG-7076
Change-Id: Ice0c2567c0db63c6c0bb76866dc9cff876a92b87
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-13 10:42:13 +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
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
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
7ef450af6d debugger: better guess at engine capabilities in dummy engine
Change-Id: Ia37086a126df7f7d84b9509c54472c5d9be6b4ef
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-13 12:19:44 +01:00
Aurindam Jana
584ac02a48 Debugging: Context Menu check for Watch Point Capability
Change-Id: I5b8d00c85f3857520757ccfd1a6007a5c2a1c50f
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-28 13:28:55 +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
58f5d8124c debugger: fix deletion of multiple watchers
Task-number: QTCREATORBUG-3586
Change-Id: I6b80ae7147301cd61277bd64abaee3fe8f910f38
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-16 18:41:34 +01:00
hjk
600a2f839e debugger: make use of dynamic type for dumpers configurable
It's too expensive to have it unconditionally on in some settings.
Giving the user the possibility to switch it off seems ok.

Change-Id: I7bdcb0ce919f0dca83a4563ac83958efdeb251e7
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-30 11:50:20 +01:00
hjk
ab45b7e663 debugger: Disable setting of watchpoints on non-existing variables
Task-number: QTCREATORBUG-5830
Change-Id: Iad4683c812e3f8debc3fe5852ee36adc4e5786ae
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-18 19:46:42 +01:00
hjk
9df694c6eb debugger: code cosmetics
Change-Id: I0fca0fe922e5a99cec551e7196fceaf0137d3ce4
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-15 12:55:43 +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
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