Commit Graph

46254 Commits

Author SHA1 Message Date
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
33c3a1fbbf Wizard: Use Qt5-style connects
Change-Id: Ibe5d1543e99644ff2c07146b9a83d9fe5b4121e1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-03 07:41:53 +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
c7419c1fff More change log for 4.0.1
Change-Id: I383cafdf23b254e07bb08232e75383279b0eb906
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-06-02 13:34:44 +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
Robert Loehning
79623d5774 Squish: Base getPaths() on new path functions
Change-Id: I54cd03bc1d24b715df15de37291f776f9867416f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-02 09:35:16 +00:00
Orgad Shaneh
75b1a8e41e QmlPuppet: Use Qt5-style connect
Change-Id: I6d0599a80ba06fffdbaa067db5a98dd72118cac3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-02 09:24:11 +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
b04b5e5d75 Squish: Provide functions for getting paths inside Qt installation
Change-Id: I273304f0c6d451d28a256c99588479525eef95e4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-06-01 14:50:25 +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
David Schulz
6c18ed50d2 Tests: Fix linking reactivated manual plugins on win.
Change-Id: Ibd4db0c6a065dd264f693d663b4a940d2f3a7e58
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-06-01 11:05:03 +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
Ulf Hermann
12f160b1f3 QmlProfiler: Add tests for FlameGraph
Change-Id: I1eadb2675e16fcc61e073ea1a730ab065456f964
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-01 09:23:22 +00:00
Ulf Hermann
652846c5c7 QmlProfiler: Add test for debug messages model
Change-Id: Ie6872646c09a89a417379a3e1f551526234ab26a
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-01 09:23:18 +00:00
Ulf Hermann
1fc9bcc025 QmlProfiler: Rename QmlProfilerNotesModel::add()
The parent class has a public add() method which has to be qualified if
the child class has a protected one.

Change-Id: I6d61d6123618fc0b5065893656b36559aa5298be
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-01 09:23:12 +00:00
Ulf Hermann
09b1fe3f20 QmlProfiler: Drop some unreachable code
The model manager will make sure that the flame graph model doesn't get
any events it doesn't accept.

Change-Id: Ibe6e06c558d138cebe6be5dbc76e8f51e9e1fd95
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-01 09:20:46 +00:00
Ulf Hermann
4436a1c7f2 QmlProfiler: Add some more consistency to flame graph model
model.parent(someFirstLevelItem) should return the invisible root item.
Methods with default parameter in the base class should also have a
default parameter in the derived class. As rowCount() is Q_INVOKABLE
columnCount() should also be.

Change-Id: I62a0ec6f91d01581fd47a43c97af63c58cdd13fa
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-01 09:20:34 +00:00
hjk
7dce6bb4f2 BinEditor: Raise size limit to 32 GB
The determining limit is now the Qt api with int values for line numbers
and scrollbar positions, giving us <= 2^31 lines with 16 bytes each.

Change-Id: I266e5bdf358b377c6e27bc2be300a0f6a60e6f68
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-01 08:47:51 +00:00
hjk
58f25a3260 ClangStaticAnalyzer: Start tool directly in test
Removes the only user of DEBUGGER_EXPORT void runAction(Core::Id actionId)

Change-Id: Ia26577e07ccc8a556882d99d6dd9f9c29c3bc883
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-06-01 08:45:17 +00:00
Orgad Shaneh
3ac867c8eb ExtensionSystem: De-slot
Change-Id: I725fc3be32eb5c723426376c59a344f4fc19443f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-01 08:07:49 +00:00
Ulf Hermann
58ecaa475c CorePlugin: Delete navigation(sub)widgets when deleting the mainwindow
Otherwise we might leak them on shutdown.

Change-Id: Id7274e6ee67b11fa9ff43b22fc6d5e62da55933f
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-01 07:44:11 +00:00
Lorenz Haas
3af36134d1 Beautifier: Make all tools MIME restrict-able
The newly introduced auto save option is restricted to user definable
MIME types. The underlaying tool's restriction, however, is only if the
current editor is a cpp editor. This patch makes the tools also MIME
types restrict-able. In addition the auto save functionality is now only
applicable if the file matches the auto save MIME types as well as the
MIME types of the chosen tool.

Change-Id: Ic430b4a07341647e6c8e95d2b802a17db1637a36
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-06-01 07:41:37 +00:00
Jake Petroules
069714b832 iostool: Print ALL error messages recognized by MobileDevice framework.
Now uses APIs instead of raw strings, and so is future-proofed.

Task-number: QTCREATORBUG-16328
Change-Id: I45f8042dee4293bd40e204002c164eb99ac754df
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-01 06:29:56 +00:00
Orgad Shaneh
eb17b224ad QtSingleApplication: Use Qt5-style connects
Change-Id: Ibc2d88e79ecc6790099ae01fe81ea843d8d68b18
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-01 06:29:23 +00:00
Orgad Shaneh
4ed9b68fbf Aggregation: Use Qt5-style connects
Change-Id: Ifee501f2da7d2834f6ce8a63f85e9fab9c683b5d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-01 05:51:32 +00:00
Orgad Shaneh
9370e863f8 ExtensionSystem: Use Qt5-style connects
Change-Id: I94f7dceff0cd53249406e9a4ec6b3b776bf00ab0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-01 05:50:29 +00:00
Orgad Shaneh
8641a5e956 Macros: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I0154e09c1a9e028f3a80772c4c07751f4e282091
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-01 05:49:45 +00:00
Orgad Shaneh
34a7ff07b7 Main: Use Qt5-style connects
Change-Id: I7619495818728f7b7196c5f8447bf446eedef248
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-01 05:35:25 +00:00
Orgad Shaneh
8de20c9d6c ExtensionSystem: Revive manual test
Change-Id: I24c627e964afa33883bde571960ed390b07be985
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-01 05:34:28 +00:00
Victor Heng
48423414f6 JsonWizard: Check widget visibility when determining if it's mandatory
The wizard is unable to advance when a mandatory field is hidden. Assume
a hidden widget is not mandatory.

Change-Id: I19bdc1a661d91b75151d3aec34ad9d584002a556
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-01 04:55:45 +00:00
hjk
0e158115e5 ios: Remove unneeded includes
Change-Id: I659538097bc1296fa0fa6aaa7f07122dcaa82416
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-31 15:24:17 +00:00
Robert Loehning
4117ba7313 Squish: Replace remaining shell usages
Change-Id: Id7c2c1a17fed053f2e8601fc4c7716705e260431
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-31 14:52:17 +00:00
hjk
a8eb924a2a Debugger: Dissolve AnalyzerUtils::logToIssuesPane()
If the Error + popup combo is generic it should live in TaskHub.
If it is not, end user code should decide when to popup.
Not an intermediate level.

Change-Id: I195ba8c17c5cc192ff9762ed6f45629143bcbb35
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-31 14:52:12 +00:00
David Schulz
3a9332812d CdbExt: Don't add version number to cdbext.
Change-Id: I23fc1669c24700f17fe985b904620497cd3293a8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-31 13:27:34 +00:00
Eike Ziller
876099d865 DocumentModel: Avoid deletion of entries for suspended documents
When opening a previously suspended document, reuse the existing entry
instead of replacing it. That way existing pointers to the entry are not
invalidated.

Fixes a regression introduced by 0c44156328
that lead to crashes when selecting suspended documents from the
history popup (ctrl+tab / opt+tab) with the mouse.

Change-Id: Id41cae1132e4435c8e8bbd8624eaf840b02dc31f
Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-31 13:24:49 +00:00
David Schulz
d21cd57e13 Editor: Animate automatic completed text.
This gives a clear hint that something has changed.
And gets the attention of the author in the case he didn't
expect some kind of automatic brace or quote completion.

Change-Id: I33e383db9a1e797ecb285a407e46671f41be7051
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-31 12:58:19 +00:00
hjk
e108d6fe48 Debugger: Fix transport of negative signed chars
Change-Id: I9b25d4b8e4b68d9cef674581d1a42eb75e21ec56
Task-number: QTCREATORBUG-16353
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-31 12:12:33 +00:00
hjk
752c2cd67f ClangStaticAnalyzer: Directly construct RunControl
This only runs directly locally, so there's currently no need to go through
the AnalyzerManager indirection.

Change-Id: Ie241b362b870e8ea0be221c501420573596e34f2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-05-31 11:24:28 +00:00
hjk
cbbdc64e8a Debugger: Make watch model root a WatchItem
QmlEngine::pdateCurrentContext() currently relies on being able to
access the 'name' member.

Change-Id: I75675681407402667da1cb82d3589980d92554a2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-31 11:07:13 +00:00
hjk
0cf9b6e956 Analyzer: Move toolbar icon specification down to individual RunControls
Giving individual RunControls the freedom back to decide what they want,
even if they currrently decide to use the same one.

Change-Id: Ia2acf4b9d32d23c486339b2488611038672aba25
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-05-31 11:07:06 +00:00
Lukas Holecek
a8a1b3b573 FakeVim: Ignore external changes in insert mode
Task-number: QTCREATORBUG-16208
Change-Id: Ic357b855f740e6c86900c13f616cd58a27175413
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-31 10:47:24 +00:00
Eike Ziller
2de7f3e723 Revert "TextEditorFactory use rvalue refs for creators"
This reverts commit 2be30c27ac.
The above patch puts limitations on the use of the API, while
being a questionable optimization. There is no reason why it
should not be possible to use lvalues for setting the various
creators. And MSVC2013 even thinks that actual functions
are lvalues for std::function objects.

Change-Id: Ia4daa7c3367b51bd613e1ff840f0ee617d36f54b
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-31 10:05:34 +00:00
Eike Ziller
73bb92c5a6 Merge remote-tracking branch 'origin/4.0'
Change-Id: I89c52ca2145a43c94d3366367ba72fde605dd577
2016-05-31 12:02:13 +02:00