Commit Graph

44349 Commits

Author SHA1 Message Date
Ulf Hermann
bae8f22a6e QmlProfiler: Add test for input events model
Change-Id: I5af5c090312173cdfdb01f88923bfde1667e799b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-06 14:43:36 +00:00
Ulf Hermann
d345755b0f QmlProfiler: Add test for flame graph view
Change-Id: I5207e03ad8955f2d291d4fc1b7e5d33b64207379
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-06 14:43:26 +00:00
David Schulz
6863acfe91 Use general vc environment script instead of platform specific.
Just use the specific scripts to detect whether a toolchain is
installed.
Partial revert of 2be4d2643a.

Task-number: QTCREATORBUG-16359
Change-Id: Ic8c8fbc30f0c1269aeb51abbd21902097bd6c285
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-06-06 13:26:59 +00:00
Christian Stenger
5a3a879a4c AutoTest: Unify naming scheme for gtest related classes and files
Change-Id: Ib0739889cbc6416da3f28f1e39b197317ec8a4e6
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-06 13:23:39 +00:00
Christian Stenger
af81016e64 AutoTest: Rename 'AutoTest*' to reflect what it is
AutoTest* is too generic within the context where it is used.
This patch renames respective classes, members and string occurrences.

Change-Id: Ie413e4a344ddaf7892ecf248ba486defb4b9e3ef
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-06 13:23:24 +00:00
hjk
04a93c3bb5 CMake: Demote non-matching generator to 'Warning'
Default KitChooser behavior is to suppress kits with errors everywhere
but non-matching CMake generator settings are irrelevant for both non-CMake
using projects and analyzer/debugger tools.

Change-Id: Ie60f0f23b5c2423128304227fc573526b7ec2113
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-06 10:53:40 +00:00
Orgad Shaneh
c64f85cd5a QtSupport: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I24cb0cd088b74364320cdd34282d7b15305a93bf
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-06 10:51:22 +00:00
Orgad Shaneh
9a637ba3e3 ProjectExplorer: De-slot internal class
Missed in 0bf7893415.

Change-Id: I91aeb31178bb329266f2c2c79a5e4c54e34d6473
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-06 10:51:18 +00:00
hjk
023b78545f Debugger: Revert parts of the 'arrayIndex' optimization
The parent's address is not always the base address of the array
data, but often a wrapper like QVector, so the correct computation
of the item's address is more involved, removing the benefits of
the optimization.

Change-Id: Iecb19799addc1502649fefbad0953b77947f4193
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-06 09:17:14 +00:00
Orgad Shaneh
624c6fe6ee QmlDebug: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I94f5c85388af1b8e06128800090222a6b64f5191
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-06-06 08:15:13 +00:00
Orgad Shaneh
d058ca6db9 QmlEditorWidgets: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: Ie56520a6b0676f986c04a1940ff9afef84d7092f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-06 08:03:43 +00:00
Orgad Shaneh
38a13f09c2 EmacsKeys: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: Ib5fda624ef6d776fd238e15b562c9fc0dd6cab58
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-06 07:54:57 +00:00
Orgad Shaneh
a9f73d079a Todo: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I6132a266f9d350dfecd7a12b03877bdcbbc31302
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-06 07:27:32 +00:00
hjk
4c09ead418 Debugger: Require only a valid debugger in Kit selection
Lately, Kit::isValid() defaults to also checking e.g. cmake
configuration which is pretty irrelevant for this use case here.

Change-Id: Idfe3bf4b8836a9b8974473c95048cd853276f9c2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-06 06:56:14 +00:00
hjk
6df0a34e99 Debugger: Add a way to copy selected values from Locals and Expressions
Task-number: QTCREATORBUG-14956
Change-Id: I2700820adf716afb784ec686297c15c48f3592f7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-06 06:54:59 +00:00
David Schulz
797dc11937 Editor: Skip auto completion when in overwrite mode.
Don't disable all aspects of the AutoCompleter, but just skip the auto
completion when text is inserted in overwrite mode.

Change-Id: I3f1e25882130817446c80623369ab882abaf915d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-06 06:34:28 +00:00
hjk
364943012b Android: Robustify settings page apply()
Change-Id: If64a56e9102efe4b8b444c3f84502a43af60d627
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-06-03 15:59:19 +00:00
Thomas Hartmann
b932d38e32 QmlDesigner: Fix compile
Change-Id: I457ea2ed8e012d27a9019b6978166ae2e9c192fb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-03 13:06:39 +00:00
Thomas Hartmann
3a95f3f46e QmlDesigner: Crash fix
The string "id" is not a valid property name.
Calling name() on an invalid property should not throw,
since it cannot have side effects and is required for e.g.
error messages.

Change-Id: I8b199ebc14fc1d9ed5796bd1bc7f15491c1bb3ec
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-03 13:03:27 +00:00
Thomas Hartmann
ee5ec83199 QmlDesigner: Remove out commented code
There is no reason to keep this along.

Change-Id: Ibcc9fb80621686d5fc953e8ccdb6440b21a79335
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-03 13:00:44 +00:00
Tim Jenssen
6c110d3120 QmlDesigner: fix crash spaces in properties
Task-number: QTCREATORBUG-16059
Change-Id: Ie6e0fa25675e1f800315de4f22558c83b7d2bba1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-03 12:34:37 +00:00
hjk
40a9463c56 FakeVim: Expand ~ in some file names
For :read and :source.

Task-number: QTCREATORBUG-11160
Change-Id: I636593a16f9e39c25585c221c5d978e842f4c1d4
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-03 11:16:36 +00:00
Christian Kandeler
b50e9e546f QbsProjectManager: Do not pop up the message pane.
Only messages of type "info" appear there these days. They should not
force the message pane to open.

Change-Id: I2e0c01574eecffb7b9df41594df8abb6fd722397
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-03 10:36:22 +00:00
Tim Jenssen
6d9782845f QmlDesigner: refactor connection editor models
- no behavior change
  - use modern Qt connect
  - moved reset method to the same location in all models

Change-Id: I5686e20a9b072e756f9bc6cc06df1377f1ca2c03
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-03 10:34:22 +00:00
Thomas Hartmann
23f873ccbc QmlDesigner: Crash fix
Trimm expression to avoid ambiguity that leads to assert.

Task-number: QTCREATORBUG-16059
Change-Id: Id5f0378e38f0edeba22236c6e9519c8107e4a311
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-03 10:20:55 +00:00
Tim Jenssen
ad23e7a9ad QmlDesigner: move delegates to an extra file
Change-Id: Iaeba3ff7dcfc93a632a93aabc89953781a2a7139
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-03 10:20:30 +00:00
Tim Jenssen
11997e08bc QmlDesigner: move compareBindingProperties method
Change-Id: Iaaeb7d4b43030e9c2efce50ff5463b670ee25fe7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-03 10:12:23 +00:00
Arnold Dumas
e8cce2a3bd ValgrindFake: Use Qt5-style connects
Change-Id: I9d4fcf45b1424cd84b836ae3b883f23709300b95
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-03 10:08:44 +00:00
Tim Jenssen
eac3beb4ac QmlDesigner: move model roles to header
Change-Id: Ib84c4049ba688159449dd1a88b5d2a046b5ff337
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-03 10:08:00 +00:00
Tim Jenssen
2d20b6953e QmlDesigner: modernize code
- no behavior change
 - use lambdas instead of extra slot functions
 - rename the comboboxes to the right names

Change-Id: I707bfb359d6bab805e05b514b3395db8d959ee81
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-03 10:04:56 +00:00
Christian Kandeler
7c3013a54a Update qbs submodule.
To HEAD of 1.5 branch.

Change-Id: I29c839b4e249808124c225cc07f89cda97d5b755
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-03 09:32:26 +00:00
Ulf Hermann
7ecd0763b9 QmlProfiler: assert that connections are AnalyzerConnections
... before accessing them as AnalyzerConnection

Change-Id: I6f6111ca3b0dede93ac85fbcb5ffbfcf3c7b19aa
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-03 08:45:01 +00:00
Ulf Hermann
7d5d026244 QmlProfiler: Remove useless dtor
Signals will be disconnected by QObject dtor anyway.

Change-Id: I193fa207e02b8f91258d165f0a7eacb0ccc4b9df
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-03 08:44:52 +00:00
Ulf Hermann
c3a873b906 QmlProfiler: Add some consistency to input events model
Methods that are public in the base class should also be public in the
derived class. Also, the accepted() method takes a type, not an event.

Change-Id: I086d382ffc2e71c7efda56b0dbf341942986582c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-03 08:44:43 +00:00
Ulf Hermann
b4462c2553 QmlProfiler: Don't consider invisible flame graph items selected
Technically they can still be selected after hiding the category they
belong to, but we shouldn't show the details window then.

Change-Id: I4f667a397dbe258a302e65b1fb8e4e6eb723c441
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-03 08:44:26 +00:00
Ulf Hermann
3684585839 QmlProfiler: clear model manager only after saving the notes
The notes model wants to resolve IDs from timeline models when saving.

Change-Id: I02c6038c8519101f36db95183bfa05d01a531b97
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-03 08:44:18 +00:00
Ulf Hermann
c81ed0bf9c QmlProfiler: Send the correct end events when restricting to range
Clamping the timestamps and then sending the original events doesn't
make a lot of sense.

Change-Id: I42a42968d0188acb040649483d642c6b3f3e1038
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-03 08:44:11 +00:00
Eike Ziller
23afc7ad22 Merge "Merge remote-tracking branch 'origin/4.0'" 2016-06-03 07:51:01 +00:00
Eike Ziller
33210099f1 Merge remote-tracking branch 'origin/4.0'
Change-Id: I9793f0f9019b16f3725c5a9708a5ccf81557cdc6
2016-06-03 09:50:43 +02:00
Orgad Shaneh
0bf7893415 ProjectExplorer: Complete Qt5-style connects
+ De-slot private and internal public slots

Change-Id: I0a62adb529ab81b7368645dbeab6edf7e237dc69
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-03 07:41:56 +00:00
Orgad Shaneh
868ec2b6d8 CMake: Pass STATIC types on cmake execution
Was submitted by mistake for 4.0 (and reverted). Resubmit for master.

Change-Id: Ie3401d009044a46af7fac314d1f29975543a44b0
(cherry picked from commit 0043c721c2)
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-03 07:41:50 +00:00
Orgad Shaneh
b59f9fd0b9 Git: Support blame for selected lines
Task-number: QTCREATORBUG-16055
Change-Id: Ib24b6d41d5eb12aa0c4ec55377c02c8ae6ea914f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2016-06-03 07:41:46 +00:00
hjk
8fd12818c9 BinEditor: Some modernization
Qt 5 connects, override, style, and a few changes from
int to 64 bit types.

Change-Id: I7ac1879c4f46fcbc5b0ab9f5a6cefdbf2b789774
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-03 06:19:20 +00:00
Nikita Baryshnikov
2fbf126e4e Utils::transform with using keyword
Change-Id: I98274bbd78a629854dd1774698158d9bdadc4096
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-02 20:29:58 +00:00
Eike Ziller
25120b2f59 Partially revert "OS X: Fix warnings in MacWebKitHelpViewer"
This partially reverts commit 729a7345f4.

The protocols only recently got formal protocols, at least 10.9 SDK
does not have it yet.

Change-Id: Ic3960d531683f88417bd1077cde69058fead3ded
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-02 12:25:27 +00:00
Orgad Shaneh
76cdbba399 AutoTest: Fix qbs build
Change-Id: I76bceb29b639b7d2eedb02673d3da5d60b24caaf
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-06-02 02:40:53 +00:00
Christian Stenger
2f8b4b3fbf AutoTest: Move test framework related code...
...into files and respective sub folders.

Change-Id: Ic80d693bd73993a6e74b6d422349e47276e8cb6e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-01 11:37:32 +00:00
Ulf Hermann
661c2407af Timeline: Don't accidentally add nullptr timeline models
Change-Id: I7ecce618c83a67742a9d57b967dbfbbccd05310e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-01 10:06:22 +00:00
Ulf Hermann
d527cc8d5a QmlProfiler: Add default argument for parent widgets on event views
Change-Id: Id67e87920a09ff2f5f5bbf73327f2cac6b299973
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-01 09:23:36 +00:00
Ulf Hermann
3174c36ab1 QmlProfiler: Add tests for flamegraph model
Change-Id: I185d06a059314f27fe48c5c2f2b92623b6611309
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-01 09:23:28 +00:00