Commit Graph

32962 Commits

Author SHA1 Message Date
David Schulz
22b0a061b0 Cdbext: Fix dumping QString from a namespaced Qt5.
Change-Id: I87736b04160a64058a20786aafb1381460c6c5f3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-06 14:13:31 +00:00
hjk
7b6ff1fed9 Debugger: Remove unneeded parameter from WatchModel::insertDataItem
All remaining uses had 'destructive' as 'true'.

Change-Id: I4eee6539c7b5e0336325a59af3379f8a3140847b
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 14:00:32 +00:00
hjk
e4c2582b62 Debugger: Dissolve WatchHandler::insertBulkData
Change-Id: Ie2b073531f28943e78e89157798fef1645d4aa2b
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:59:54 +00:00
hjk
3f79ae203f Debugger: Start disentangling WatchHandler::insertData
Rename the list overload. Make the single item overload use
the direct path to insertItem, hook the column resize requests
to the showing/hiding of the watchers pane.

Change-Id: I0a1940c8e1919341a815e6bccbcf55d989d663da
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:59:42 +00:00
hjk
46fcfa9018 Debugger: Remove widget argument from tooltip request
The only information ever used is whether it's c++ or not.

Change-Id: I4ca00663856dd66cbdf58c468f175a8c9e41d6a5
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:57:53 +00:00
hjk
34c807a11a Debugger: Remove WatchUpdateFlags
Only needed in the non-Python days. CDB didn't use it to start with.

Change-Id: Ia609218cc1a694f797e278c4d99ead68e6212938
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:55:55 +00:00
hjk
7c2c3307b3 Debugger: Simplify GdbEngine::updateWatchData
The removed parts were only used with the non-Python engine.

Change-Id: Ia6858517b011c6f7ace8b2521beafdb4b03efc89
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:54:56 +00:00
Orgad Shaneh
329c493764 Utils: Modernize connections
Change-Id: I4650abc84e7c82a4054197319f6c849af9e5b8ce
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 13:47:27 +00:00
hjk
df00a7af64 Debugger: Move watcher modification from delegate to model
We don't need the remove/re-insert cycle in the new model,
so the expression modification can be done directly.

Change-Id: If9626f48fcfbcf75e61d332afb59b986da6c2dbc
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 12:47:55 +00:00
Ulf Hermann
862f9a46e6 Timeline: Add some forgotten braces
This broke window recalculation when the window was clamped
against the trace end.

Change-Id: I6c62e1440476ea9e36b08a2edd3e0c3bb2dec931
Task-number: QTCREATORBUG-14105
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-03-06 11:54:33 +00:00
hjk
a7bf3c49a4 Debugger: Remove WatchHandler::insertIncompleteData
... and replace at caller side it with the used parts
of the code.

Change-Id: Id612c66ac6d95bfc12aba16e9247cc81991dd779
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 10:40:30 +00:00
hjk
74f7cd1c26 Debugger: Simplify watcher handling in GdbEngine
There was only one user on GdbEngine::insertData left, and this
always took the !isSomethingNeeded branch.

Change-Id: Ibe51f7a7689be39ad3ffd60099a9cbe7b614648a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-03-06 09:49:23 +00:00
David Schulz
36fe342853 Cdb: Reduce insertIncompleteData usage.
Change-Id: Ia71d32c40bbe4737061d021c37844a1fd84b9657
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 09:28:30 +00:00
Christian Stenger
1641d9a59e Vcs: Fix compile for Qt < 5.4
Introduced with 7a05c9ea5b

Change-Id: Iddf3c3ace15e1f79acc59d4024f796428b1a4713
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-06 08:58:19 +00:00
hjk
b981f5049d Debugger: Let LldbEngine pass current token to dumper
Change-Id: Ifea751354f637f67e640d36ba1baa95678c86ee9
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-06 08:43:37 +00:00
Hugues Delorme
a0f8a67d7a Bzr: use Qt5 connects in BazaarPlugin
Change-Id: Iaa264abd266cdbaa34212f5d3faca21f855c6bbb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-06 08:05:25 +00:00
Hugues Delorme
7a05c9ea5b VcsBase: use Qt5 connects
Change-Id: I386da06c9abe27913e85b2ed9984a83938f5457c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-06 08:05:08 +00:00
Hugues Delorme
f7bdbc66e0 Vcs: rename overload SubmitEditor::diffSelectedFiles() for rows
-> Renamed to diffSelectedRows()

This allows to use easily Qt5 connects, without ugly casting to
pick the right overload

Change-Id: Ifaa0242febccb4e1aadd53470cc4b3be79b07c18
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
(cherry picked from commit 12fac12e8f)
2015-03-06 08:02:35 +00:00
hjk
831ae98678 Utils: Simplify SavedAction interface
It's not really used for inheritance, so the virtuality of
everything was over-engineered.

Also remove the duplicated connection to QSpinBox.
The "cooked" connection was useless (and arguably wrong).

Change-Id: I917124d690b37166bb38ddd5399f11ec43a14f16
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-06 07:16:21 +00:00
Orgad Shaneh
3c537312a0 Core: Fix compilation
Change-Id: If3b4a3e716ac76b153148b0ed9517ea07f963370
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-06 06:36:20 +00:00
hjk
5558615510 Debugger: Avoid warnings about wrong cmd line option to CDB on startup
Task-number: QTCREATORBUG-14100
Change-Id: I88775b51587120a765cdfcde798b0ac7313ec7ab
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-03-05 17:32:39 +00:00
hjk
68807bdde1 Debugger: Avoid some undesired state transitions on shutdown
Seeing an ill engine while trying to stop means that the stop failed.
Also, a finished master engine doesn't need further updates.

Task-number: QTCREATORBUG-14089
Change-Id: Icd5b090dfcdc0875953d8756a909b1405e05f71f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-05 14:40:48 +00:00
hjk
9e0a27207c Debugger: Fix display name of undereferenced pointers
This was a regression introduced by the migration of the WatchHandler
to the new tree models.

Task-number: QTCREATORBUG-14098
Change-Id: Id97c3927e7e19d501a8e7e01e12b28ffe2a66c68
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-05 14:25:04 +00:00
hjk
7b3a185d41 Debugger: Suppress gdb warnings regarding controlling terminal
Causes more confusion for users than actual trouble. A hint is
still left in the debugger log, so it's not completely gone.

Task-number: QTCREATORBUG-3918
Change-Id: I51244094811bcb5c436f0631cb02dbf41cc202bf
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-05 12:35:56 +00:00
Eike Ziller
86378da3be Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	src/plugins/debugger/debuggeroptionspage.cpp

Change-Id: I0282d66b16c14877d0131cccbe03573102b48bc3
2015-03-05 13:28:15 +01:00
hjk
39f904957a Debugger: Merge GDB/LLDB process error handling
This also removes some of the "illegal" state transitions,
partially addressing QTCREATORBUG-14089.

Change-Id: I817d87a0b5e0a40285bc9b0880fef5bceaee3f16
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-05 11:55:37 +00:00
Eike Ziller
4d2359443f Mime settings: Fix crash when reading invalid custom data
This also deduplicates the validity checks on MIME magic data

Change-Id: I0ce0df61ca4459b3e1190f75b778abd04bc908bd
Task-number: QTCREATORBUG-13987
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-05 11:15:32 +00:00
Eike Ziller
673be1a3f8 MimeDatabase: Do not crash/assert on invalid mime magic data
Change-Id: I355241e472b1bb379ccc94fdd896c6d894206b0a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-05 11:09:17 +00:00
Friedemann Kleint
a1abbb983b Clean exported headers of the Remote Linux, Android plugins.
Change-Id: Ie7825b9c7f3e131a8afaebbd4c245f1227c8dcd4
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-05 11:05:17 +00:00
Ulf Hermann
cdb369931e QmlProfiler: Show timeline view by default
When starting the QML profiler for the first time there is no saved
state and the V8 view was shown by default because of the way the
dock widgets are created. This is not very useful.

Change-Id: I5f8873405b3ebc0683ce8d578466631499932c08
Task-number: QTCREATORBUG-14060
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-03-05 10:55:39 +00:00
Ulf Hermann
43adc29a6e Timeline: Allow horizontal resizing of detail windows
The details table can become quite large, so we elide the text.
However, as we don't know what kind of information we're hiding and
the user might want to see it it's quite practical to allow resizing.

Also, make sure that the detail window (and the range window) is on
top of everything else so that it can set the cursor shape.

Task-number: QTCREATORBUG-14054
Change-Id: I12850124c327c57c148b69960687b7402bdead90
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-03-05 10:54:49 +00:00
Ulf Hermann
11cee807b7 Timeline: Check end time for sanity before setting range
Change-Id: I69a3ea81b1c4e1df51663d8e5c75972f67635a26
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-03-05 10:46:52 +00:00
hjk
cf58a1dc15 Debugger: Mark unexpected state transitions of mixed engine
... prominently with red color in the log.

Change-Id: Id9d86227bbcc269a0870ff93e372f28ab4b2618b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-05 09:47:18 +00:00
Friedemann Kleint
1b9be30371 Clean headers in lib qmljs and plugins qmljstools, qmljseditor.
Change-Id: I3256db8f4d42b6326d986d754b45e6c6c2030839
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-05 08:17:10 +00:00
Friedemann Kleint
fb80206f3c Clean exported headers of the CppTools plugin.
Change-Id: I0144ac33e88980c431c54a6d69bbde28da4b1967
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-05 08:16:48 +00:00
hjk
5eedf273be Debugger: Remove unused StartParameter members
Change-Id: I38a0ea389bf4cb792c26f713660cbe0143c35f8a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-05 07:28:21 +00:00
hjk
e2421afd1b Debugger: Simplify *SlaveEngineType StartParameters members
The secondSlaveEngineType was not really used, and the first
either NoEngineType or identical to the cppEngineType.

Change-Id: I1725728ca38636f228ff9b9d8ca7d643a34c64e8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-05 07:24:47 +00:00
hjk
e79808a8f7 Debugger: Don't show a location marker in the mixed master engine
Task-number: QTCREATORBUG-14087
Change-Id: I7e8f116c97cdea0bd8234d060d068435229e6fc2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-05 07:23:02 +00:00
Friedemann Kleint
54da18eaaa Clean exported headers of the Core plugin.
Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-05 07:18:14 +00:00
Orgad Shaneh
93f57a99a1 C++: Fix nested type resolving in member functions
Task-number: QTCREATORBUG-13976
Task-number: QTCREATORBUG-13978
Change-Id: I598f9cb99ffd044abfc6ed9aa16d4a3045985008
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2015-03-05 06:23:31 +00:00
Orgad Shaneh
0b996210f6 Project: Deduplicate dependency resolving logic
Change-Id: I6af80600b060fa6a99704df0709461799858d41e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-03-04 18:19:00 +00:00
Friedemann Kleint
e747817c95 Clean headers of the Qt Designer plugin.
Change-Id: Ie0906cf88043c78d109ab7e1b342e62547680d45
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-03-04 15:41:33 +00:00
hjk
02404afd9f Debugger: Allow evaluation of children of evaluated expressions
Task-number: QTCREATORBUG-5920
Change-Id: I00a42b93e3840f106ee9d4e94e1bc9f677e13e3f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-04 14:40:14 +00:00
hjk
d5f9f78172 Debugger: Remove 'Lldb stdout:' qualification in debugger log
That was an early aid to get LLDB up and running.

Change-Id: Iac95806cee561a40cd90039f534739a2663e395f
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-04 14:30:29 +00:00
Friedemann Kleint
b79c4a37e4 Remove duplicated Qt 4 private headers used for building the Qt Designer plugin.
As of Qt 5, the Qt Designer integration no longer relies on
private Qt Designer headers.

Change-Id: Ib2909e856232491e9067ccc9cad6df86e9da086b
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-04 13:58:43 +00:00
Orgad Shaneh
7ebc031ad4 Project: Remove unused function
Change-Id: I6e74577841d4c9c304393a1e2c672ec3e43fd7e4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-03-04 13:25:37 +00:00
hjk
04532fe604 Debugger: Add some expandable macros to Debugger options page
New %{Debugger:Name} for global use, %{Debugger:{Type,Version,...}}
for expansion within the name. Also re-initialize from file if the
saved version is empty (e.g. if the debugger was registered before
the version field was present)

Change-Id: I45568d78147597b30074a2ce4ddcf569bce15192
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-04 13:01:13 +00:00
Christian Stenger
1896d2cc0e FakeVim: Change default keyboard sequence for FakeVim...
...on OSX to make it possible to enter and leave with the same
shortcut. Adjust user command mapping as well to be able to
execute these from inside FakeVim mode as well.

Task-number: QTCREATORBUG-14082
Change-Id: Ib93f798a61b4ed16db7cca7b3c927e1fb6bd5d0f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-04 11:37:08 +00:00
Christian Kandeler
b9ab6b3f49 Fix detection of debug/release Qt.
QtVersion::hasDebugBuild() and QtVersion::hasReleaseBuild() don't work
as one might expect.

Task-number: QBS-757
Change-Id: I1f591750761c76a6d064f4e489ee21a6e1683ec6
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-03-04 10:39:49 +00:00
hjk
f9d2134cb1 Debugger: Disconnect LLDB process before destroying the engine
Task-number: QTCREATORBUG-14083
Change-Id: Ic59460dc64b949711fefc82ca137218d3072f7d2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-04 10:09:55 +00:00