Commit Graph

40153 Commits

Author SHA1 Message Date
Eike Ziller
4a1b6c1fd8 Merge branch '3.4' of git://code.qt.io/qt-creator/qt-creator into 3.4 2015-03-05 13:28:39 +01: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
Christian Stenger
7142402429 Squish: Fix tst_rename_file
Changed behavior due to changes related to MIME database.

Change-Id: I54bbfd8ca5d027716ef6bca308df0863635fe474
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-03-05 12:25:53 +00: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
hjk
46d515529a Tests: Use real project dependencies in memcheck test
Change-Id: Iced26e5b2a4a4ba5e1075e19eeffe96b2e298d0f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-04 14:03: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
hjk
3ddbba1415 Debugger: Postpone location reporting in LLDB stops
... to the initial stack contents report. This helps to avoid unwanted
assembler reports in cases where we have to skip over "spurious"
stopped events.

Change-Id: I3340297ab01f976ab9d918fe73f69f4f32b12c03
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-04 13:01:06 +00:00
Eike Ziller
9b68aade38 Add changes-3.3.2
Change-Id: I660fe06a7949817c7516b9870dde264ee5d2088c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-03-04 11:52:20 +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
Leena Miettinen
53a29f5b83 Doc: fix remaining links to Qt wiki in docs
Change-Id: Ia9193cf1870241104bf099ad2e47e3ead4eb43fd
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-04 10:49:37 +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
hjk
33eeb5880b ProjectExplorer: Replace two uses of QAction::setData
... by a connection to a lambda.

Change-Id: I32a276146cf6a4cfc79ae9c133a4cb5f0783c867
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 09:56:07 +00:00
hjk
e36b40161e QmlJS: Fix crash in PathsAndLanguages::compact()
Task-number: QTCREATORBUG-13786
Change-Id: If8c84714382c751f51315d62e1d4b0764e4431ff
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2015-03-04 09:33:19 +00:00
hjk
e35809bd31 Add shootout test for multiple identical lambdas
This helps to compare code sizes generated by lambdas.

Change-Id: I6734a26f59ec622ec8d4dfdea2c9e83340c11d73
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-04 09:29:55 +00:00
Thiago Macieira
3e54ec22e5 Don't concatenate QStrings if concatenating string literals is fine
Change-Id: Ia0aac2f09e9245339951ffff13c81b3d3ea0987e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-04 09:10:43 +00:00
hjk
7f20035881 Git: Replace two uses of QAction::setData
Change-Id: I540d1fd221cc331c230950cb97848e39780b650c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-04 08:23:49 +00:00
hjk
8a3c5bc1e7 Debugger: Skip interpretation of unreadable register content
Task-number: QTCREATORBUG-14029
Change-Id: I88553377a567607c7748c4875a5991e8fb0d52ab
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
v3.4.0-beta1
2015-03-03 16:47:18 +00:00
hjk
6288d2833b Debugger: Remove 'Remote' qualification from 'Debug Server'
While using the Debug Server typically does involve a remotely running
debug server (GDBServer or other stub) it's also possible and sometimes
useful to use it locally.

Change-Id: I7b041b14cc09d15ae3e6b501c9298f78764e256d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-03-03 14:10:25 +00:00
hjk
aaf4c3e978 Debugger: Remove unused signal and slots
... from GdbRemoteServerEngine

Change-Id: Icc7ebc9fd9ef6ce710b77cc59fd1b9937e21cfd8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-03 13:24:08 +00:00
hjk
17b5c9bb72 ProjectExplorer: Quieten soft assert in KitModel
Task-number: QTCREATORBUG-13830
Change-Id: Ie6950a797a4156a1934c263128ee0446f8b5fff0
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-03-03 13:11:52 +00:00
Christian Kandeler
c5dfc33b3d Valgrind: Log errors to issues pane instead of popping up a QMessageBox.
Just as informative, but less intrusive and can't introduce event loop
problems.

Change-Id: I7dec17b1e82ba23340376075125f965017047959
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-03 12:53:44 +00:00
Orgad Shaneh
b70081ae71 QtSupport: Register mimetype for qm and ts files
ts appears in freedesktop, but it is ambiguous.

Change-Id: Iacc1386551f79eb885c03db7329f592394428f66
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-03 11:57:33 +00:00
Friedemann Kleint
4829e94672 Clean exported headers of the QtSupport plugin.
Change-Id: I6da98c3a9d5a89f80e721aed0e9fbf0f9ca6b43d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-03 11:06:59 +00:00
hjk
fb785895f2 Debugger: Make LldbEngine stack handling more similar to GdbEngine
This also addresses the remaining issues of QTCREATORBUG-13803.

Task-number: QTCREATORBUG-13803
Change-Id: Iceb123279236d98961d15fe7421acc7c10d1b1c7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-03 10:21:25 +00:00
Tobias Hunger
bdbe119dbe Git: Remove unnecessary destructor
Change-Id: Ib4041924e1544d1ec2c5837c62c23554c6be0e91
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-03 10:20:32 +00:00
hjk
518a44a780 Debugger: Remove some soft asserts
They can legitimately appear in regular use right now.

Task-number: QTCREATORBUG-13938
Change-Id: Id7097c82866375060545db6ddbbecbf1fbf5da6d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-03 09:49:39 +00:00
hjk
49fa8afcb9 Debugger: Move some tooltip model code out of treeview
Closer to the usual pattern.

Change-Id: Iee0f095a59755424bd2e494aaa89215669d02972
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-03 09:49:30 +00:00
Sergio Ahumada
3af3fe7ad3 Replace old qt-project.org wiki with wiki.qt.io
Change-Id: Ie7518d57b62e3f0b9dc6c559fe4a8f5b0212bb43
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
v3.3.2
2015-03-03 09:35:41 +00:00
Eike Ziller
0efef6e3cd Add changes file for 3.4
Change-Id: I1f56e6ad05b9bed7642b2a5827c27c824dec0aba
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-03-03 08:48:17 +00:00