Commit Graph

57165 Commits

Author SHA1 Message Date
Ulf Hermann
c771928f53 ConsoleProcess: Silence some compiler warnings
Change-Id: Ia143eccfeafcbadff82653a59c201ae9d98e0499
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-07 06:55:47 +00:00
hjk
4425d15550 AutoTest: Remove unnecessary createConfigurationWidget() reimplementation
Change-Id: Iae31628b20e69e584478d9c23b7e2309d88a6922
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-07 06:22:17 +00:00
hjk
71a7595451 WinRT: Use new auto aspect layout handling to simplify code
Change-Id: Ic73573c15185df29cb5b3f87cd274e1c8dec043a
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-09-07 06:21:53 +00:00
hjk
4cb0b3fa73 Debugger: Make enum class dumper test pass again for gdb
Change-Id: Iaded82ab13f30e7222eb14f548ac72d1c6502b7d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-06 13:41:51 +00:00
hjk
8de44d9281 Debugger: Make std::once dumper test pass again on Linux
Change-Id: I46ad9bb8ed3beb4aac23f5b3cca69f3ef0c92971
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-06 13:35:08 +00:00
hjk
b3b4465b2f Debugger: Make std::unordered_set test pass again
For some reason order is not important in that context...

Change-Id: I0961dd5be7775d190b9bef6b739dc9d690eb36a9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-06 13:11:18 +00:00
hjk
06b6fff25e ProjectExplorer: Simplify LocalEnvspect's BaseEnvironmentModifier
The run configuration is known at setup time, and fixed.

Change-Id: Iad7837bf39fb5eeed49bd71b7f14b9692014ea9d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-06 12:12:53 +00:00
Marco Bubke
2a30f0e5d6 Clang: Improve generated files handling
Generated files are referenced by the system collector directly to set the
unsaved files.

Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-06 11:26:00 +00:00
Robert Loehning
461d5b5d15 Use faster ctor for QColor
Change-Id: Id4e44222e6e0dd61b1a73d774906e8804ba75a73
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-06 10:07:20 +00:00
Robert Loehning
da6c7972b0 DocumentManager: Follow clazy's suggestion to use QHash instead of QMap
Change-Id: Icdae5e06db43c75408522d6331b4c56433a09ca9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-06 10:06:33 +00:00
Christian Stenger
8c6975b0fc Utils: Fix compile for UNIX when using Qt5.9
QProcess::startDetached(qint64 *) has been introduced
in Qt5.10. When using Qt5.9 just use the old way where
it was not possible to set the environment for the
process. Additionally disable the respective UI part
to avoid complaining users.
Amends 626665b7a4 and 72ada44be3.

Change-Id: I34233402fe385035566484431838dd6edbda483e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-06 09:12:52 +00:00
Eike Ziller
019092d7f6 Fix terminal command on macOS
After 4c88c1808c the terminal command
itself may no longer have quoted spaces (since it is directly passed to
QProcess as the program name).

Change-Id: Iee4b9a6c3a87c29cb29cc732f6027f1c742f9eb5
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-06 08:11:30 +00:00
Tobias Hunger
c16c477333 ProjectExplorer: Fix spelling in constant name
Change-Id: I137e5479dc13dee8b86455ae59d810ebb21a63df
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-09-06 07:45:55 +00:00
Jochen Becher
f4a7d02c09 ModelEditor: Reload documents
Task-number: QTCREATORBUG-20612
Change-Id: Ie4a89f17e9f062ab273b58f19b8c5d6193cedacc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-05 18:05:29 +00:00
Jochen Becher
2c2faf8749 ModelEditor: remove redundant static keyword
Change-Id: I527341c7d85c159ba4869576bb8b2df3de2344cd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-05 18:05:16 +00:00
Jochen Becher
17d6efd5a0 ModelEditor: Use nullptr instead of 0
Change-Id: I317cec41bd537bbb5fb52c75c6c267651e76a121
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-05 18:05:04 +00:00
Thomas Hartmann
caaa1a70a9 QmlDesigner: Crash Fix
We somehow managed to raise a more general exception.
There is no reason to not play safe.

Change-Id: I44ff0d6c3e5181e1c067b1b5d6620cd6a8723d27
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-09-05 13:37:58 +00:00
Thomas Hartmann
015dbeba3e QmlDesigner: Stabilize annotation code
We have to ensure to replace old blocks
if the line breaks have been removed.

Change-Id: Ice63d63bd945a3477461311ee7653f0f4cb784e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-09-05 13:37:43 +00:00
David Schulz
4d256654e0 LSP: do not connect the clients finished signal multiple times to the manager
Change-Id: I3f4d176837eda7ef2cf672f9d9cbdd5ba7d54bbe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-05 11:55:01 +00:00
Tobias Hunger
72ada44be3 Add "Open Terminal" to EnvironmentWidget
Add a "Open Terminal" button to the environment widget. This opens
a terminal with the environment set up in the current working directory
of Qt Creator.

Task-number: QTCREATORBUG-19692
Change-Id: I33f60969d2a05a15f6f8fc1051f255e6c64f1e58
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-05 11:47:15 +00:00
Tobias Hunger
626665b7a4 Allow to set environment for "Open Terminal"
Change-Id: If6e82ef8a7bbbaa947b41e0f6746d2b2aa770c20
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-05 11:46:51 +00:00
Tobias Hunger
a1ba378d8c CMake: Do not try to use icecream for cmake configuration runs
Task-number: QTCREATORBUG-21003
Change-Id: I166fdf2e540238d9ddd8694a0a7ad65e238e3331
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2018-09-05 11:41:28 +00:00
Tobias Hunger
bfc76b4cd8 Environment: Do not allow keys containing '='
Those keys will cause trouble later, so do not allow them.

Change-Id: Ib2f51a469253d9df21c6a77faa47e6e88feadc07
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-05 11:40:49 +00:00
Christian Stenger
1016dc0603 Squish: Refactor starting Qt Creator from Squish
Change-Id: I7cbce7db2a22a7cb327965b9b7918eb46266b260
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-09-05 09:24:18 +00:00
David Schulz
50c808b1ef LSP: do not potentially call the move assignment operator twice
This was caused by a diamond shaped inheritance hierarchy. Remove this
hierarchy by copying all accessor functions to the specialized class.

Change-Id: I877ee22a944a188bbcedda22de33a528529bf423
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-05 08:50:18 +00:00
hjk
f76c5dc8e3 Debugger: Left-align status line contents
Change-Id: Idd6e32aa113b8eccc828b519fa0946e5051fc55d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-05 08:39:24 +00:00
Ulf Hermann
2d93a20bb6 QmlProject: Allow different QML viewers per project
Change-Id: I7ca136fe1cf51b8335a15b1b2b7ea838e4859f78
Reviewed-by: hjk <hjk@qt.io>
2018-09-05 07:55:33 +00:00
Michael Weghorn
1ae96a9090 Debugger: Fix display of children in GDB's PlainDumper
The 'putSubItem' method expects an object of the
Value class as defined in 'dumper.py'.
Therefore, create such an object for the gdb.Value
when passing it into the method.

Task-number: QTCREATORBUG-21000
Change-Id: I5277f832ee2aae808824f3dcf728fdaa0e2a3c78
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-09-05 05:41:55 +00:00
hjk
c7f0285c4c Debugger: Consolidate breakpoint search
We already have a concept of Context when action on editor events,
use that directly when searching an (almost) matching breakpoint
instead of translating it into breakpoint manager's interface
language.

This also centralizes the guesswork for non-exact matches in one
place, making it easier to fix currently wrong matches later.

Change-Id: I5579e7e01792d425cad4ccf1dbcbbd1bd56c84ec
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-04 13:33:29 +00:00
Eike Ziller
c30b629b52 Fix environment for Start and Debug External Application
In this case we do not have a run configuration with the needed
information, so use the system environment, modified by the kit's
environment changes.

Task-number: QTCREATORBUG-20185
Change-Id: Ie95e6eecf0b81f09f2f2aca3d5e792e5b39d000c
Reviewed-by: hjk <hjk@qt.io>
2018-09-04 13:18:14 +00:00
hjk
4192d7d62f ProjectExplorer: Compactify runconfiguration aspect creation
Change-Id: I12394d3df8deb7666be6ac3f112082f915454e82
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-09-04 12:45:21 +00:00
Robert Loehning
41764e0d71 .gitignore: Ignore Squish config files we don't use
Change-Id: Id4a25cd1952666aaba8efface910cbb70235c825
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-04 12:08:44 +00:00
Christian Stenger
58c0325b9d AutoTest: Fix handling cancellation for timeout
If the timeout triggered a cancellation of a test run the
testrunner missed to inform the progress manager about this.
This in turn resulted in a sticky progress widget which even
could pile up with further progress widgets.
Fix this by explicitly informing the progress manager of the
cancellation.

Change-Id: Ie19a1aa998e19f911cd0dd856008552baaffeb9b
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-09-04 11:43:33 +00:00
Christian Kandeler
c39fd1c36a Update qbs submodule
To HEAD of 1.12 branch.

Change-Id: Idbbb9054b73c8f1330da17bb6ff5f6534046993d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-04 11:36:35 +00:00
Eike Ziller
2c17fbe8dd Make Core independent from QtHelp
We don't want various plugins to depend on the Help plugin,
but we also do not want Core to depend on QtHelp.
For example when turning the Help plugin off, documentation should
actually no longer be registered through QtHelp. So we need
parts of the interface in Core, which must then be delegated
to the actual implementation in Help.

As positive side-effects the interface in Core will be slimmer,
and the code in the Help plugin can later be simplified, too,
because then we don't have the "Core" and the "Gui" help engines
separated in different plugins anymore, which should remove the
need for some setup indirections.

Task-number: QTCREATORBUG-20381
Change-Id: I634c5811c45d6a3dfd6ddc682cae270e38384cbf
Reviewed-by: hjk <hjk@qt.io>
2018-09-04 11:21:18 +00:00
hjk
25400751a4 ProjectExplorer: Remove RunConfiguration::fillConfigurationLayout
Instead of using a hard-coded list of well-known (optional) aspects,
add all aspects, so there is no need for special treatment of
RunConfiguration with unusual/custom aspects needed.

Price and benefit is that the individual run configs are again
responsible for the aspect display order which is determined
from the aspect construction order.

Change-Id: Iff2656b2e358c0f0f789d4c006a5c44d0a1536a5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-09-04 11:02:49 +00:00
Orgad Shaneh
760e6a9b13 Git: Fix launching of gitk when not in PATH
Tries the following:
* <git binary path>/gitk
* If git path ends with bin [or usr/bin, or mingw*/bin], try ../[../]cmd
* Search gitk in the PATH

Task-number: QTCREATORBUG-1577
Change-Id: I7f5e3d490bfeb527e2a5c1720126f1345e07eee0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-04 09:33:25 +00:00
hjk
0a265ce266 ProjectExplorer: Allow labels with pixmaps in string based aspects
Can be used to show warning icons etc.

Change-Id: I3ec845c11ea8147482ed90a0fac3c008bcffdec3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-09-04 08:37:39 +00:00
Oliver Wolff
74c5512475 winrt: Use full path when running windeployqt
As winrt does not have the concept of a run environment acquiring the
path to windeployqt from the environment might lead to unexpected results
like using windeployqt from a different Qt installation. Calling the
program with its absolute path is the safer alternative and thus should
be the default anyways.

Task-number: QTBUG-70175
Change-Id: I6eb5416275d7ff243f396bf1fccdbcb9d04f7e15
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-04 07:43:26 +00:00
David Schulz
37a8c901d2 Utils: Do not export inlined functions
Change-Id: I1a61b526179d843cc6379044fb1fc4a8b283f3d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-04 07:25:31 +00:00
Christian Stenger
d058dcc326 AutoTest: Filter out interfering environment variables
If there are environment variables that might interfere with
the test process filter them out before setting the environment
for the test process as they can - in the worst case - even
lead to being not able to execute the test application at all.

Task-number: QTCREATORBUG-21012
Change-Id: I4a2059cf527395498824a0914fd6c3203eca9bcf
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-09-04 06:06:33 +00:00
Jochen Becher
d20b907b94 ModelEditor: Reduce size of images in clipboard
Pasting lots of diagrams into a document needs to much RAM.

Change-Id: I7f8e3e11b55ab5861ed708d622d32b473b6cb86c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-03 17:52:04 +00:00
Jochen Becher
63bd6938c6 ModelEditor: Scroll sync'ed item into view
Change-Id: I8a2911d4cc15656ee08037060a4573429ccbc1be
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-03 17:51:44 +00:00
Jochen Becher
6db88a5927 ModelEditor: Zoom large diagrams at mouse cursor
Change-Id: I56da68cbf2175e76bbfe8c64641a366d0d38b878
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-03 17:51:16 +00:00
Jochen Becher
741885a52b ModelEditor: Layout elements on diagram
Change-Id: I7f02375a4c4626ba4719bb965eb949c07f628a01
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-03 17:51:03 +00:00
Christian Kandeler
39d7aa7f70 QbsProjectManager: Only hold one build graph per project
Keeping the build graphs of all enabled targets in memory does not
scale.

Task-number: QTCREATORBUG-20622
Change-Id: Iab711e7e789db51a5ee13aa9bf3c9fbb2e08aa89
Reviewed-by: hjk <hjk@qt.io>
2018-09-03 15:34:44 +00:00
Marco Bubke
3d9974db95 Utils: Fix small string
Change-Id: I6a746eb28c6c803b9ade9f626a950cf93ba6fe99
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:26:05 +00:00
Eike Ziller
e40b250d13 Add line/column number handling to spotlight locator filter
Otherwise it is not possible to directly open a file at a location with
the spotlight filter (in the style of "md qwidget.cpp:100").

Task-number: QTCREATORBUG-20473
Change-Id: I9ee70c411f77ca715ebba864ef16eab7c9b31bde
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-09-03 12:30:11 +00:00
Eike Ziller
4c88c1808c Make terminal settings more flexible
Currently "Open Terminal Here" and such expect the terminal
command without any arguments to be behaving correctly for this.
That is not the case for Konsole at least, since it just opens another
window in a running instance, with the same working directory, when
not convinced to do otherwise with additional command line parameters

Separate options for "Open Terminal Here" and "Run in terminal" in the
options.

Task-number: QTCREATORBUG-20900
Change-Id: I598d1f7f0bf22b5c21dc1c60333397bdf9fab1b4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-09-03 12:29:21 +00:00
Ulf Hermann
f13a7fc988 FileInProjectFinder: Add dtor
Some compilers need to know that the destructor is not inline here. It
cannot be inline because PathMappingNode's dtor is not exported.

Change-Id: I37cbf31cf83a8aa571a0a6708e3ad520b035bc53
Reviewed-by: Alexander Shevchenko <sav_ix@ukr.net>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-03 12:27:24 +00:00