Commit Graph

57165 Commits

Author SHA1 Message Date
Orgad Shaneh
ad052a0831 CppEditor: Avoid deprecated QModelIndex::child
Change-Id: I16ddb7338955968025488c78211c1672ce7c77c7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-09-21 08:17:01 +00:00
Orgad Shaneh
6296e7bb38 Git: Avoid usage of deprecated QDateTime::fromTime_t
Change-Id: I37ce617990ee385e37261624d847a0aef757d283
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-09-21 08:16:28 +00:00
Orgad Shaneh
539b10727e Merge remote-tracking branch 'origin/4.8'
Conflicts:
	src/plugins/debugger/debuggermainwindow.cpp

Change-Id: I07496916dd37b842d57ce5c49f99c079a9095a5f
2018-09-21 10:49:44 +03:00
Christian Stenger
f350c4d1d4 AutoTest: Replace some scary wording
Change-Id: If8c45824c80ed6dd2da5874af56e61ab7abb3305
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-09-21 07:40:17 +00:00
David Schulz
525b51edd9 LSP: fix StdIOClient match function
Change-Id: I6834b43c25ed80a3bcbb293019dd15116ece8356
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-21 07:37:19 +00:00
David Schulz
f5843a29bc LSP: make fromMap() a non static member function
Change-Id: I24844cae784921e0128f475b792453fa65c566ce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-21 07:36:12 +00:00
Christian Stenger
898bd4aa68 ProjectExplorer: Hide button explicitly if not available
The button had been displayed inside its parent's top left corner.
So, hide the button explicitly if we cannot provide the (full)
functionality of it.

Change-Id: I05c5be1315ed004510b69bbaf54b566956e076d7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-21 07:33:21 +00:00
Eike Ziller
d3d47dd521 Merge remote-tracking branch 'origin/4.7' into 4.8
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Ia1d6035a335fd56069ec8d6d106d58124ee8798d
2018-09-21 09:26:38 +02:00
Orgad Shaneh
b49175c86a Core: Avoid deprecated QDateTime::toTime_t
Change-Id: I96364e5c0bfa478483614910025169ffb7369b51
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-21 07:23:25 +00:00
Orgad Shaneh
8f4d67da8f Core/ProjectExplorer: Avoid deprecated QModelIndex::child
Change-Id: I74b16a90a534ea16642f8444a9915cfd19ce33de
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-21 07:11:56 +00:00
Orgad Shaneh
f9da340c6b Debugger: Remove obsolete condition
We don't support Windows earlier than 7.

Change-Id: I5782e65ad4e6fb1c8acd9d083ccc410133178cd5
Reviewed-by: hjk <hjk@qt.io>
2018-09-21 06:55:09 +00:00
Christian Stenger
bab836c009 AutoTest: Provide way to remember last chosen run configurations
In some special setups it is almost impossible to get the right
executable or run configuration. For bigger projects this can
become a pain point when trying to execute tests and always
getting asked which one to run.
So, allow remembering the choice and use it if appropriate.
The cached information is not stored permanently.

Resetting of the cached information can also be triggered by
switching or closing the current project and inside the settings.

Task-number: QTCREATORBUG-20859
Change-Id: If416ea0ae9ad3548daca2ffcf5888fd568fd2622
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-09-21 06:52:39 +00:00
Orgad Shaneh
8d814facf7 Replace QString::null with default constructed QString
QString::null is deprecated since Qt 5.9.

Change-Id: Ib84f338ed8cecaee0c164191fb580c851bd84ab4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-21 06:47:33 +00:00
hjk
6635f85d47 Debugger: Move some debugger specific bits out of debuggermainwindow.*
A step towards making the perspective handling independent of the
debugger plugin.

Change-Id: Ic07f4b34d44c48f16a494ba7f470e0a34d3d56a3
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-09-21 06:14:05 +00:00
Orgad Shaneh
46886d01e6 CppEditor: Use some member initializers
Change-Id: Ia30723b5a208fee2b7cf18aa95f6b1aadf70422f
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-21 06:14:05 +00:00
Orgad Shaneh
6059d560bc TextEditor: Add punctuation to nameForStyle
This amends commit 50e5aacb02.

Change-Id: I9ff8dc5757f527f499f6268b7c92b938af4cd0d3
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-21 06:13:43 +00:00
Friedemann Kleint
3c8f8f1ffc qtcdebugger: Extend help text
Factor out a helper function to read out the current debugger.
Display the currently registered debugger and the Qt version used in the
help. Enable copying the message box text.

This offers a convenient way of checking since the debugger settings often
get overwritten by OS or MSVC updates.

Change-Id: If61e30ae22802b71960cb6f3da96100f5fd9e47c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-09-21 06:00:30 +00:00
Orgad Shaneh
d88a0d8e68 Utils: Modernize
range-based for, nullptr, member initializers, override.

Change-Id: I21ac5b23883c08dbd75819bb3298bc956cdb972c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-09-21 05:37:39 +00:00
Orgad Shaneh
9364e4b8ec Core: Modernize (minor)
Replace 2 loops with range loops, and use nullptr.

Change-Id: I9f8920bb978ed218c5ec9ca01105652ebb51d842
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-09-21 05:28:12 +00:00
Orgad Shaneh
12e253df9d AutoTest: Remove usages of deprecated QModelIndex::child
Change-Id: I8b310a54d6c1a044c94edac8fd67dfa8b2fcfb91
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-21 04:48:27 +00:00
Frank Meerkoetter
d7be70afd4 CppEditor: binary literal support for ConvertNumericLiteral
Extend the ConvertNumeric literal quickfix to support
C++14 binary literals.

Change-Id: Ia1cf8633e80ddf7d968a881d17ce2a07c5de89d3
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-09-20 19:29:03 +00:00
Uladzimir Bely
3502a0f7f2 Enable Browse button in Baremetal run configuration
Fixes: QTCREATORBUG-20747
Change-Id: Idf0a53fc3d016e14f1f605ef2317177da115406d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-09-20 15:36:02 +00:00
Tim Jenssen
a1ac17a409 QmlDesigner: fix convert warnings
Change-Id: I1689ba3517b85a02be3a582040b39377bc11be84
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-09-20 13:37:08 +00:00
Tim Jenssen
cdfb4c6cb6 QmlDesigner: no extra method necessary
Change-Id: I1f088246936140112823e319bbf9ccfd58b0ec34
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-09-20 13:36:55 +00:00
Tim Jenssen
80c4a9b785 fix dependencies
Change-Id: Ie1e9c9312ef5a8aa37816d9dedddb41c839f3580
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-20 13:35:02 +00:00
David Schulz
dc155b407d LSP: rename LanguageClientSettings -> BaseSettings
And move the static init function to a separate class.

Change-Id: I7c924ce72ad74047e6bfdb04fa04a6132050a360
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-20 13:08:16 +00:00
David Schulz
d7b4f3fcf2 LSP: store settings on the heap
In preperation for specialized settings other than the stdio client

Change-Id: I20ca33fd1d714e4e0ca527de86261c0a58740d15
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-20 13:08:05 +00:00
David Schulz
1b2ad0e989 LSP: let the settings generate the client
In preperation for settings other than the stdio client.

Change-Id: I11635119db9165163947d822e911ee26ce8548f1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-20 13:04:54 +00:00
David Schulz
fb058b850b LSP: limit the number of server restart attempts
Change-Id: I65f845d44bcfb318f36d876c0806c7b48e8e09df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-20 12:37:54 +00:00
David Schulz
5ef4530b8f LSP: use asynchronous shutdown for running servers
Change-Id: I3b1853177d07c98e051de0bc9f494389fbf4c104
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-20 12:37:48 +00:00
Eike Ziller
6cf573534f Bump version to 4.7.2
Change-Id: I10b0692b069aa587ab39156ddd6c4601646ff493
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-20 12:24:23 +00:00
Nikolai Kosjar
08ec1f9326 CppTools: Fix crash on smart selection change with lambda
...in case there is no lambda declarator provided, e.g.: []{}

Fixes: QTCREATORBUG-20994
Change-Id: I6a77cffe4e585422f1ed0639cabc687d3d123f5d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2018-09-20 11:09:43 +00:00
hjk
bcb2df7b30 Debugger: Add Perspective::name() accessor
Will be needed again by GammaRay.

Change-Id: I9afe61dd1db4a1ba4ec95a6abd089e12c6cbcd9a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-20 10:43:39 +00:00
Orgad Shaneh
41dee83bec TextEditor: Modernize
override, auto, nullptr, member initializers.

Change-Id: I04c6ebb683849568973bd7782fb5a3279267141e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-20 08:48:49 +00:00
Orgad Shaneh
439bc225e1 Clang/CppTools: Replace Q_DECL_NOEXCEPT with noexcept
Change-Id: I105a5ed5e4a5c647f947a413ae8123d02bfdae3f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-09-20 08:36:45 +00:00
hjk
b9a8e77a82 ProjectExplorer: Decommission RunWorkerFactory::priority
The only ever user (AppManager) doesn't need it for disambiguation
anymore.

Change-Id: Iea2f4d545bf9afb0610bf73c4ec7b2f29357edc0
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-09-20 08:25:51 +00:00
hjk
ed2fbeeecf RemoteLinux: Remove RemoteLinuxKillAppStep::createConfigWidget
Identical to base AbstractRemoteLinuxDeployStep::createConfigWidget.

Change-Id: I10a94514e50839950eb4e07a4ce1b4c004b51881
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-09-20 08:20:44 +00:00
hjk
7bd3f06828 Make BuildStep::createConfigWidget default implementation non-pure
Amends 760723f7. The intention was actually that the default
implementation is not only good enough, but also that there doesn't
need to be a re-implementation to call it.

Change-Id: I47bd4dba6f8df2826d17696f727252954a5bbabf
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-09-20 08:20:24 +00:00
Christian Stenger
7465958c1e ProjectExplorer: Restrict disabling button to UNIX
There is no need to disable the button on Windows as there
is Win API used instead of Qt.
Amends 8c6975b0fc.

Change-Id: I48fff19f804aed52cb363a9569562b5a447562b5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-20 08:15:50 +00:00
Jonathan Liu
807b0f78fc ProjectExplorer: Do not add too many newlines for remote processes
Do not add newlines when remote process output gets flushed.

Task-number: QTCREATORBUG-19367
Change-Id: I9e878695279404d436264abd580884fb6a9e91ad
Reviewed-by: hjk <hjk@qt.io>
2018-09-20 07:43:33 +00:00
Orgad Shaneh
1156646ce2 TextEditor: Pass dialogParent where needed
Change-Id: I57c41d0e8e37472a1a5070ea082b4c2e1ff6d287
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-20 07:22:55 +00:00
Eike Ziller
b9db5ea86e Move documentationPath() from Core::ICore to Core::HelpManager
It is documentation related API, so it belongs there.

Change-Id: I5d1676f251e6deb92050ddedac19bf3c332aab54
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-09-20 07:19:49 +00:00
hjk
82688cabd1 RemoteLinux: Merge {Abstract,Generic}RLCustomCommandDeploymentStep
... into a RemoteLinuxCustomCommandDeploymentStep class.

There's only one one incarnation of the abstract base, and neither the
base nor the implementation is really big enough anymore to justify the
hierarchy.

Change-Id: I85759051589482ad48efc0e3cad4679416ceb387
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-09-20 07:13:48 +00:00
Orgad Shaneh
8a472bb0ad Subversion: Modernize
override, auto, nullptr

Change-Id: If8a0d438299eecb876ec5a5ab2bea3d21a5256d8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-09-20 07:03:14 +00:00
Frank Meerkoetter
17fdb595a0 cppeditor: remove misleading Qt4/Qt5 label in WrapStringLiteral
QStringLiteral and QLatin1String play a different role and have
different properties. QLatin1String isn't strictly Qt4. Qt4 had
QLatin1Literal (for which QLatin1String is nowadays a compat alias).

Change-Id: Ie2a5f7d9d29ad8db735743a9d9579c4c0828cd45
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-09-20 07:02:32 +00:00
Orgad Shaneh
8f65486dfc VCSBase: Modernize
override, auto, nullptr, member initializers.

Change-Id: Ie21b8f4a4d6673947d82619bc3de677fcea63d7f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-09-20 07:02:17 +00:00
Orgad Shaneh
e0520794f5 Perforce: Modernize
override, auto, nullptr

Change-Id: I82f63fbe06d098e71876c30af0fe247a5bae3a55
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-09-20 06:59:17 +00:00
Nikolai Kosjar
9dea4c0743 Tests: Fix generichighlighter/highlighterengine test
highlighter.cpp: In member function ‘void TextEditor::Highlighter::applyFormat(...)
highlighter.cpp:572:22: error: ‘fontSettings’ was not declared in this scope

Broken by 6ea686faa9.

Fix by adapting the mock/fake header.

Change-Id: I700a7ed4573c44f04ead5a2e6f2df198edaaebb4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-09-20 06:12:33 +00:00
Orgad Shaneh
b9e39ed5e0 ClearCase: Modernize
override, auto, nullptr

Change-Id: I07ba03d44e2560797cc496acc96b57b41703320c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-09-20 05:31:28 +00:00
Orgad Shaneh
9cdce2ed52 CVS: Modernize
override, auto, nullptr

Change-Id: I1611ca33b1c3ddd563d9e74f77dbcdc903b65b78
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-09-20 05:28:45 +00:00