Commit Graph

45338 Commits

Author SHA1 Message Date
Christian Kandeler
b41346cf5b CppTools: Add file path to extra info in function Locator filter.
This helps tremendously in the not uncommon case of the same class being
implemented in several files (e.g. for different operating systems).
Until now, users would be completely at a loss as to which of the
results was the one they were interested in.

Change-Id: I3ef8c8dc93b89e68eaf323a7ad2067b075d8cfb1
Task-number: QTCREATORBUG-11125
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-04 10:36:47 +00:00
Eike Ziller
b967e2c225 QmlJsSemanticHighlighter: Don't use global thread pool
And simplify the code

Change-Id: I87cc08dc276485d2e1e6934cfbc049e7870e14e0
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-04 10:13:29 +00:00
Eike Ziller
41d4fabf34 runAsync: Allow thread priority without thread pool
Change-Id: I6d4ee8fa1bf45c7a24ff6a004b3c69007c645547
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-04 10:13:20 +00:00
Christian Stenger
af3029dc65 AutoTest: Avoid dangling pointer
Change-Id: I44b4aed459403ad9ea87d3213a6a355b9836b3fb
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-02-04 08:47:59 +00:00
Friedemann Kleint
97af238656 Preferably use QStringRef::toInt().
Avoid allocations for converting to int.

Change-Id: Id8c79334f4809ec075ffe7e6b7635be4873eafd8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-04 07:56:58 +00:00
Christian Stenger
30b1e70c42 AutoTest: Report parse results through QFutureInterface
Change-Id: Ib99e9ae5efa26f01dd9c0b0bf5516e2e9dab73ce
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-04 06:05:14 +00:00
Robert Loehning
fa3a35e346 Git: Make "Create Repository" action local
Change-Id: Id52d145ca6a8120fb28c6a800bfd4ac497e4260d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-03 16:30:15 +00:00
Friedemann Kleint
5c81e26a72 msvc2tasks.pl: Add support for clang-cl.exe and match errors, too.
Move regexp filtering into subroutine for clarity.

Task-number: QTCREATORBUG-15641
Task-number: QTBUG-50804
Change-Id: I2b78e82f41b83c64053b350b241f3c14246eb417
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-03 16:02:43 +00:00
Tobias Hunger
bb8270bab3 VcsBase: Modernize headers
* Use pragma once
* Use override
* Remove Q_DECLARE_PRIVATE as that makes no sense for QtCreator

Change-Id: Ic31d4868c172a0b8fcb50cc9a71a6e95639cf84c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-03 15:53:22 +00:00
Friedemann Kleint
96ca2e57f0 Move declaration of ProjectExplorerSettingsWidget into .cpp file.
Alternative fix to ff8dd50f7b .

Change-Id: I151b45f73b19309979f1a3a1d6617e45f3205442
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-03 15:49:13 +00:00
Eike Ziller
cbd5f8e905 Generic highlighter: Use runAsync and avoid deleteLater
There is no need for the highlight files processor to be a Q_OBJECT, and
it can also be created on the stack (and moved to the thread).

Change-Id: Ic347b1b7e5ece50642b85654fb2701fe5994619b
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-03 15:06:36 +00:00
Eike Ziller
b19cac022e runAsync: Add test for move-only types
Excludes MSVC2013 which doesn't really support moving.

Change-Id: I2bffa546f2c90946b4d99e0eee292741b900a386
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-03 14:08:36 +00:00
Eike Ziller
1f8e5bd3f2 runAsync: Use universal references again
We don't use std::thread anymore, so we don't need to avoid universal
references in the called function. (std::thread with MSVC2013 does not
correctly forward the function arguments.)

Change-Id: I2a2fb0bd9b4cfcfe47baecb0b53d78e67f97f442
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-03 14:08:13 +00:00
Orgad Shaneh
be82a24a49 Core: Sort find filters by name
Change-Id: I8975b474cf8c009e5a634464a451ef922adb02ec
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-03 14:08:02 +00:00
Robert Loehning
cb7b24be15 Squish: Try to stabilize tst_qml_js_console
Change-Id: I9de2d7784954ebe658530505ba64e816a95d411c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-03 13:53:36 +00:00
Christian Stenger
c31af6315f AutoTest: Provide setting to outvote automatically disabling parser
Test parser is normally disabled as long neither test tree nor results
pane is opened. The new setting allows the user to enable the parser
without the need to have one of these widgets opened.

Task-number: QTCREATORBUG-15669
Change-Id: I354e1a3cb91eeca2302f2344fd443c81c4b15406
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-02-03 13:36:21 +00:00
Friedemann Kleint
537a5c0067 Autotest: Use QStyleOptionViewItem instead of QStyleOptionViewItemV4.
Fixes warnings:
warning: 'QStyleOptionViewItemV4' is deprecated (declared at ../../../../qt-dev/qtbase/include/QtWidgets/../../src/widgets/styles/qstyleoption.h:390) [-Wdeprecated-declarations]

Change-Id: I41683dc7f449b7e738a6e058b8c0a1e051da6c50
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-03 12:48:59 +00:00
Christian Stenger
b3ac3ff933 ProjectExplorer: Fix compile with gcc 4.7.3
Change-Id: I66cfcce3668d7c08d4a5f5dfe230c94f7c641759
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-03 12:46:57 +00:00
Marco Bubke
6068a19ce4 CppEditor: Fix virtual overload in VirtualFunctionProposalItem
Change-Id: Ibeb767edf29b180041267355711a69a5839f9388
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-03 10:42:31 +00:00
Alessandro Portale
698e56eda8 Default Theme (Flat Icon mode): Improve contrast between icon states
Increase the contrast between enabled and disabled icons. Reduce the
contrast beween enabled icons and enabled icons with custom colors:
stop, run, resume, warning, error, info.

Change-Id: If6ae0659fb0adbd28c121ec4718449b0ca9e3270
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-03 10:01:20 +00:00
Eike Ziller
b1b118821b Merge remote-tracking branch 'origin/3.6'
Change-Id: Iba662995e76f1b6ec135d64072a36a2498b2b5bb
2016-02-03 10:55:48 +01:00
Alessandro Portale
ccf57c3303 Icons: Use theme color for disabled icon state
The color role was already availabe in Utils::Theme, but
Utils::Icon didn't yet make use of it. That was a bug.

Change-Id: Ifb99e08567223c0999296fde34f61de21b764b14
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-03 09:47:41 +00:00
hjk
f1ccad12dc Valgrind: Remove MemcheckRunner::localHostAddressRetrieved() etc
It was only ever used to run second valgrindProcess()->setValgrindArguments
(fullValgrindArguments()) in the memcheck tool which was already done in
ValgrindRunner::start()

Change-Id: I95a6005e2131eea25215f17cd0e7244a3d8df12e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-02-03 08:46:30 +00:00
Tobias Hunger
f4296d7504 ProjectExplorer: Modernize
* Use override where appropriate
* Use pragma once
* Make more constructors explicit

Change-Id: I2865fe10f288e3de570826058e43b70a0cb4ee37
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-03 08:29:08 +00:00
Orgad Shaneh
6a3e687d14 Git: Fix crash on Grep
If the process is already finished, and cancel is triggered Creator crashes.

For example, search for "q" in qt-creator, wait for >200K popup, then wait a few
seconds for the process to finish and press Cancel.

The reason for the crash is that reportFinished() is called twice - one from
GitGrepRunner::finish() and another one from Utils::runAsyncImpl().

Change-Id: I61d379f5e3a5ae86c9a48a3751dbb2e00203516d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-03 08:13:58 +00:00
Orgad Shaneh
5646480f27 Core: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I2dde14919d917816d02117338205f8f861d8af0a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-03 07:54:02 +00:00
Eike Ziller
7a9cc3499e QmlJsEditor: Avoid QtConcurrent::run
Change-Id: Id95acdeb2be21721950c6926494a5d2e5a00d8bb
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-03 07:45:07 +00:00
hjk
bbadda2f25 Valgrind: Use SshConnectionManager to handle connections
Change-Id: I15a985880cdd48b74524089492dc9a32f7448999
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-02-02 21:36:30 +00:00
Alessandro Portale
75e13a3aeb Debugger: More recognizable beetle
Change-Id: I62cf0ebc766c1d8543adff8d2a23a22f2bf31d18
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-02-02 17:18:23 +00:00
hjk
c49a813552 Valgrind: Simplify ValgrindRunner::Private setup
Change-Id: I0842544abfe55e9f168e6e19b2bd8c38cf506564
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-02-02 16:09:43 +00:00
Mitch Curtis
b00f7e1723 Align copied stacktrace contents with spaces instead of tabs
So that they are properly aligned in columns.

Change-Id: I71279133492fee477541e255da809662b6f1ba5a
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-02-02 16:02:37 +00:00
Tobias Hunger
a2a506c67b ProjectExplorer: Remove debug code
Change-Id: I4a5281f1c43fb8a86ed1a37bb59622daec7a0cd7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-02 15:52:11 +00:00
Tobias Hunger
5fac028f88 ProjectExplorer: Re-enable Tools>Options>Build & Run>General page
Change-Id: Ic139f61ad60f322e3efd4b33e123d3ac7d976c2d
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2016-02-02 15:51:08 +00:00
Tobias Hunger
ff8dd50f7b ProjectExplorer: Make ProjectExplorerSettingsPage build again
Change-Id: Ic407ee1d29ec83ace610b852a05f1bfc7402513a
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2016-02-02 15:51:02 +00:00
hjk
e7132f6714 Valgrind: Remove unneeded 'slot' markup in CallgrindRunner
Change-Id: I1f4b6855cc3fc3a418e26f4900c3fd439cfa6f36
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-02 15:41:35 +00:00
Friedemann Kleint
9be9fcc7fc IOutputParser::setChildParser(): Do not connect to 0.
Fixes warnings:
WARN  : ProjectExplorer::ProjectExplorerPlugin::testMsvcOutputParsers(Multiline error) QObject::connect: invalid null parameter

when running:
qtcreator -test ProjectExplorer,testMsvcOutputParsers

Change-Id: I07285b43873d76d67fcb0a67a9955d95ec1ac267
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-02 15:30:21 +00:00
Tobias Hunger
da05ddc339 Debugger: Remove assert
It is perfectly valid for a kit to not have a debugger. Do not
soft-assert in that case.

Change-Id: I89b7a125935188c0ce9479ea68cd403b59e72563
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-02-02 15:29:52 +00:00
hjk
3f4d107b0b Valgrind: Remove runtime dependency to RemoteLinux
Not needed anymore. The combination works nevertheless.

Change-Id: I3e24be38061b78b1d107eed5b2f1ae4cc1cfc64f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-02-02 15:28:53 +00:00
hjk
da9c027003 DeviceApplicationRunner: Remove unneeded references to ssh
Compiles fine with the generic base classes.

Change-Id: I39b669a1c85379ca938d35d753a19debb1fd59cd
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-02-02 15:23:02 +00:00
hjk
92079ab5d5 RemoteLinux: Remove RemoteLinuxRunControlPrivate::runnable
Instead, use the copy in the RunControl base class.

Change-Id: Ib72876b131236de8cb8f5cecbad9ec381d7e0e3e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-02-02 15:22:52 +00:00
Friedemann Kleint
90074022f0 ProjectExplorerPlugin: Mark tests as private slots.
Otherwise, they cannot be run from the test system.

Change-Id: I6137548b20718b44565281edcd55f48667054878
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-02 15:17:46 +00:00
hjk
5973484de4 RemoteLinux: Remove RemoteLinuxRunControlPrivate::device
The base RunControl has now a copy of its own.

Change-Id: Ic830015603975891ef96335518f39b4cf032f29f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-02-02 15:13:39 +00:00
Tobias Hunger
9d40a1d920 TextEditor: Fix warning about missing override
Change-Id: If24db77c644d0b7cf0e27fd18818f0671572fabc
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-02 14:47:05 +00:00
Tobias Hunger
412dd23e0f ProjectExplorer: Simplify code a little bit
Use an QTC_ASSERT in favor of an if. This may not happen.

Change-Id: I4e8d58210f9caff9b8ae7d0fccf764d8ceeace9e
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-02-02 14:46:47 +00:00
Christian Stenger
26c7afdfb7 TextEditor: Fix compile with gcc 4.7.3
Change-Id: I59b401c4d7a75398fddc8f6e3a0671fc49f0cb47
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-02-02 14:40:14 +00:00
Tim Jenssen
de28ab0a6f QmlDesigner: using pragma once at formeditor files
- also clean up some empty lines and include orders

Change-Id: Ia076951a6b0060ae70c53f213bdb5d6a12abd319
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-02-02 14:30:56 +00:00
Tim Jenssen
a75a97db1b QmlDesigner: use unique_ptr for tool classes
Change-Id: I73db95aca8d082943f076d243db3926f560209f1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-02-02 14:30:48 +00:00
Christian Kandeler
94ceccd0eb Utils: Fix qbs build.
Qt 5.6 no longer pulls in the pthread library.

Change-Id: I8b266cf89e9e05aaff3d7cd5ea36707e49e8ccdb
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-02 14:22:13 +00:00
hjk
dcfb622126 Valgrind: Simplify device setup and handling
Make isLocal() less intrusively used and correct.  Use the stored device
more often, also handle errors more quickly.

Change-Id: I146d1f5788ea79d0a9d7b058c81908d451cf00d0
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-02-02 14:14:02 +00:00
Christian Kandeler
d14257736e Sqlite: Add additional Utf8String::operator==.
There was operator==(const Utf8String &, const char *), but not the
counterpart with the argument types switched.

Change-Id: Ie9ef5c21da0c39881ecad7ea080b87eefe6c4d02
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-02-02 14:03:04 +00:00