Commit Graph

54723 Commits

Author SHA1 Message Date
Marco Benelli
2123aebf65 QmlJS: keep track of cursor position in reformatting
Task-number: QTCREATORBUG-18416
Change-Id: I30c07e0bff1b3f3933ff0e4aee8f1f2c81bd5ef6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-06-26 07:09:48 +00:00
Friedemann Kleint
eadd033fb9 EnvironmentItem: Introduce operation enumeration
Extend operations to handle prepend/append which can be optionally
determined by diff(). This allows cleanly implementing
the MSVC toolchain setup.

Amends c7a84634fd

Change-Id: Ida08d8f5e00cf5f78c20ea8d08c531b1ed22c015
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-06-26 06:40:50 +00:00
Orgad Shaneh
5f973de952 Merge remote-tracking branch 'origin/4.3'
Change-Id: Ib5405ed2c3356f65b49fe2f454f8ac2e0de44ef6
2017-06-26 08:24:26 +03:00
Orgad Shaneh
59a0aeb739 Git: Fix and add accelerators in branches dialog
Change-Id: I5a3d1d2b8fe4f97635e12ff946187c5fb5207a43
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-25 18:17:37 +00:00
Orgad Shaneh
85a971fae1 Git: Remove unused setting
Change-Id: I0c5888fbbcf2302eb6db128ea3c6603751afa612
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-25 18:17:08 +00:00
Jake Petroules
e3285ce85d Auto-detect CMake in standard paths on Windows and macOS
Change-Id: I8ae765eaed5bc234347e01fe81c208b77c1c32ec
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-23 17:41:13 +00:00
Jake Petroules
7ff48935e8 Explicitly specify the minimum macOS version in the qtcjson library
Also don't set the value in more than one place.

Change-Id: Iea1dc1d4e127c12d6333799dda91749eb2d604d4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-23 17:28:58 +00:00
Orgad Shaneh
2c55c10cac Clang: Adapt unit tests to clang-5.0
Disable the tests on clang-3.x.

Change-Id: I80a8840c25e55785034abf7b5964a14afb01d9e7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-23 14:49:18 +00:00
Tobias Hunger
29cf39bfd6 ProjectExplorer: Fix crash in AppOutputPane
The RunControl owns the Formatter set on the OutputWindow. Make
sure the OutputWindow is deleted before the RunControl and avoid
some useless setting of the Formatter.

Task-number: QTCREATORBUG-18428
Change-Id: I40c8f032bb04c484957a35a6bbc0fda7b6491c51
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-23 14:22:08 +00:00
Eike Ziller
e133ee8928 Separate locator input widget from result list & popup
The input field may not care whether the result list is actually in a
popup or not.

Change-Id: Ia15f9a32441243de458e4e55d2daef6204b9dd59
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-23 13:38:07 +00:00
hjk
3a45d763ca Debugger: Remove DebuggerStartParameters::connParams
It's nowadays a duplicate of a subset of what DSP::remoteChannel
provides.

Change-Id: I95363bd392cb1d24fb1f1e0a2780c2c295929cea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-23 13:09:04 +00:00
hjk
e797f41759 RemoteLinux: Prepare for downstream Qdb adaptations
Change-Id: Ie00eb97cd0aeaf8eac193ead3048c180fe39808e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-06-23 12:43:09 +00:00
Przemyslaw Gorszkowski
c6771c39c1 CppEditor: Fix quickfix for adding include for static functions
Task-number: QTCREATORBUG-14499
Change-Id: Id3e962ed310f43c33b91c7834a1f9ca074519a38
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-23 11:47:24 +00:00
Eike Ziller
a9eb1d39c8 Locator: Reduce interdependency between item list and input field
By not getting the currently selected row at arbitrary times.
This introduces a slight behavior change for an improbable edge case,
which could be viewed as an improvement:
If there are multiple filters active, and the first, higher priority one
could finished much faster than the second, lower priority one, the
following sequence

Wait for results from first filter
Press return
Move up or down
Second filter finishes/cancels

without this patch did not select the item where you pressed return, but
the item that was selected when the second filter finished.

Change-Id: Iba2c72e2494824de961782ba3fe0bb1041072614
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-06-23 11:36:12 +00:00
hjk
fc8dee4675 Valgrind: Make the (threaded) parser a proper member of the runner
Simplifies user code, and it was only ever used in a 1:1 relation,
even in the tests.

Change-Id: I3ce4fc83a361aceb730c05420efdb4ea52d37cda
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-23 11:30:32 +00:00
Ivan Donchevskii
7edd5876a5 MsvcToolchain: Fix wchar_t warnings for C files
For pure C compilation we do not need _WCHAR_T_DEFINED
flag.

Task-number: QTCREATORBUG-17235
Change-Id: I05fb04622056a19581cf45ac9a707864cd1cdf8f
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-23 10:18:55 +00:00
Tobias Hunger
95e277d31a ProgressManager: Simplify code in ProgressBar
Use member initialization, remove unnecessary destructor, remove QLatin1*

Change-Id: I116fdd7439b30c51e672402789382f2265543345
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-23 10:17:51 +00:00
Tobias Hunger
64c5f960e8 CMake: Return an empty project tree if parsing failed
This triggers the logic in Project to show the top level project
file in the project tree.

Remove similar logic in CMake.

Change-Id: I2bfdd3f5e3d4126910a3feb480cec5ef689954ed
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
2017-06-23 09:56:07 +00:00
hjk
88fd4043d8 Valgrind: Merge MemCheckRunner and ValgrindRunner base
It's mostly the xml/log handling, which can be re-used in other tools.

The change is purely mechanical, including some style fixes and
some modernization.

Change-Id: I6b44ae71451e8d3e26df40b9af9b4ec70038a92d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-23 09:41:28 +00:00
Thomas Hartmann
7062fd5138 QmlDesigner: Avoid accidentally changing gradients
The designer was changing gradient stops if the item "selected"
in the edit mode has a gradient. The first gradient stop was set to white.
There is still an issue with setting up the gradient editor in this case,
but the file is not changed anymore.

Task-number: QTCREATORBUG-18421
Change-Id: Ifd6829590a8a7b5217c53f49054f8738bdb71563
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-23 08:52:36 +00:00
Thomas Hartmann
3944c73c51 QmlDesigner: Fix combobox for font family
The editable combobox had some serious issues.

I changed the signals we react to and the properties
we use.

We react on activated to change to fonts in the model. For some
reason using currentText does not work reliable.
We have to retrieve the current etxt manually using
textAt().

We also react to accepted to changes in the text edit.
Here we simply use editText.

We also react to selection changes and change
the font.

Change-Id: I99abd7609f8b64ef446ce154aed0c2a61dfa00f9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-23 08:50:27 +00:00
Alexander Drozdov
1acd9d30dc BareMetal: fix Run configuration
Run configuration is broken for remote GDB and hardware debuggers:
just first target can be handled for project.

Task-number: QTCREATORBUG-18434
Change-Id: I3fcff2d906f377dd5a161f74d2c6b21bc5ab943f
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2017-06-23 06:28:24 +00:00
David Schulz
7293c01210 Debugger: Fix inappropriate debugger warning when using mixed debugging
Change-Id: I3fb1818e36d01f69cca6ad07653afdc49bda702e
Reviewed-by: hjk <hjk@qt.io>
2017-06-23 05:25:54 +00:00
hjk
ffc97df7a6 Debugger: Remove remote setup sub-statemachinery
Not needed anymore in the world of RunWorkers.

Change-Id: Id7fb24fece6acb03de12f2677dd99a05c513e7a4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-06-22 12:28:08 +00:00
Thomas Hartmann
2e128db77f QmlDesigner: Use ";" as delimiter for QMLDESIGNER_RC_PATHS
This is what is used in the qml2puppet.

Change-Id: I5c9ce65863539395d0f2c56e7be89998fd26f341
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-22 12:01:57 +00:00
hjk
b1e23b7121 Revert "Make the output window readonly, but still keyboard friendly"
This reverts commit 3080d0d9e7.

Having the output pane editable is considered a feature by some as
it allows easy modification of the contents before passing into
other, less accessible interfaces, like Gerrit comment fields.

Task-number: QTCREATORBUG-18418
Change-Id: Ice0c6c5e5787d242c714a7b0f61559a70d25d243
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-06-22 11:03:19 +00:00
hjk
107df0a7c1 BareMetal: Remove last uses of the remote setup sub-statemachinery
Change-Id: I295f1fda6dc82c74769bc78f2074480b83dd7a0a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-22 10:13:59 +00:00
hjk
4ecb1283fe Debugger: Do not crash in (im)possible situations
Task-number: QTCREATORBUG-18427
Change-Id: I800c2f8d4ea37b28022d789a2e519e4f5286f08a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-22 09:37:37 +00:00
David Schulz
4322990926 Editor: Simplify text marks
Moving defaultToolTip and color from TextMarkRegistry to TextMark.
Allowing every instance of a TextMark object to define these
information.

Change-Id: Iec1794372cf902b34d343402074e3999e7f9faf7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-22 08:42:40 +00:00
hjk
fe3facb015 Valgrind: Dissolve CallGrindRunner
Basically merge with CallGrindToolRunner, to which there was
a 1:1 relationship.

Change-Id: Iebd9325c36e82b966f873d380395065e087958e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-22 08:42:34 +00:00
hjk
acc9da0861 Valgrind: Merge MemCheck{,WithGdb}ToolRunner
Change-Id: Iaf0707cf5c06ef29c33da835133948256869c76a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-22 08:38:17 +00:00
Tim Jenssen
533f92c1bd Mobile platforms: initialize params in one go
Change-Id: I2b6097b6c1212e750b27f95055331fed6736b182
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-06-22 08:27:28 +00:00
Tobias Hunger
8ede32677e CMake: Fix logic for target filtering
Broken by e42f3db9f0 from today:-/ Sorry.

Change-Id: I4803039939de5aae893a701e2bd6399d3fbfae1f
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-21 13:59:17 +00:00
Christian Stenger
bd259129b5 Tests: Fix compile
Broke with 4e96f2ce.

Change-Id: I7c467cc92cc8444bd3b1ef41eebff089668a0f31
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-21 13:34:36 +00:00
Orgad Shaneh
a33bf92bd2 GDB: Set OsAbi also when the executable is ELF and the toolchain is not
If the toolchain is misconfigured, it's still possible to save GDB from
crashing by reading the binary format from the executable.

Change-Id: I8f8db163e1dd6aef31fed23b1306e714e563646a
Reviewed-by: hjk <hjk@qt.io>
2017-06-21 09:13:21 +00:00
Ivan Donchevskii
1e68d91cb1 Clang: fix intrinsic errors with boost
Add extra define not to include intrinsic headers
from boost headers.

Task-number: QTCREATORBUG-16439
Change-Id: I887fe63e2560afebdbe9f3d3587f99f95d408997
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-21 08:12:08 +00:00
Tobias Hunger
bee61b0fec CMake: Improve parsing of "CMake Error at" messages
Handle more "CMake error at" messages. This includes the generic
"Parsing failed" message from cmake.

Change-Id: Ie036c606bd7a8ad9cafbc32a34a77f8b95c3defa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-21 08:06:08 +00:00
Tobias Hunger
228dec629f CMake: Remove spurios newlines
Change-Id: I6f381d4df8b9174f74d1b44364e0fbea58c1e6b6
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-21 08:05:11 +00:00
Orgad Shaneh
25f5710df2 Dumper: Use correct integer value for enums
In case of an enum bitfield

Change-Id: I1e7756d5dffb4d81030795c495f2474a77c50452
Reviewed-by: hjk <hjk@qt.io>
2017-06-20 16:26:57 +00:00
Marco Bubke
f34324d419 Add old default text style as Default Classic
Change-Id: Id38993095862a0f2097598ee9000dbcdc77b6030
Reviewed-by: hjk <hjk@qt.io>
2017-06-20 16:00:09 +00:00
Tobias Hunger
bc22de5f0a ProjectExplorer: Do not use version manager cache in threads
Do not use VcsManager's cache of version control systems from different
threads.

Iterate over all IVersionControls instead of getting the specific version
control for a directory. This is less exact, but will probably not hurt users.

Task-number: QTCREATORBUG-18258
Change-Id: Iae2be5735a0d7ecc8d774904f6681963fca1d114
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-20 14:24:02 +00:00
hjk
40bd9aba9c ClangStaticAnalyzer: Adapt to new simpler RunControl creation
Change-Id: Ib088828a9695938afb83bcdd2d5fd4124dd602a8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-06-20 13:49:50 +00:00
Tobias Hunger
e42f3db9f0 CMake: Avoid duplicate build targets
Make sure that build targets that get added explicitly are never reported
by any of the readers, too. This makes sure entries will not show up twice
in the UI.

Task-number: QTCREATORBUG-18409
Change-Id: Id5039add262211fd87cd5c2884df2af0fcf24577
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-20 13:39:40 +00:00
Tobias Hunger
dac2a188de CMake: Make sure no empty strings end up in deployment data
Task-number: QTCREATORBUG-18406
Change-Id: I0b9f8ca76cee8ad2e9ae2ee1f124f16f473033d5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-20 13:39:12 +00:00
Tobias Hunger
a027f1cfce CMake: Only handle strings at start of line
Allow comments at the start of line only (or after only space characters) in
CMakeCache.txt-style lines.

Task-number: QTCREATORBUG-18385
Change-Id: I8b69144ea4f6a667ae1df382c8c4c1e88eca799b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-20 13:38:28 +00:00
Claus Steuer
8542ebcd5d CMake: Do not react to builds in the background
If an error occurs while persisting or updating the cmake state, the
build might continue for a while in the background.

CMakeBuildStep does not disconnect the Error/Run-Trigger when an
error is signaled by the CMakeBuildConfiguration. Instead it reports the
build as finished (with error). The BuildManager then disconnects the
output and runs the next item in the build queue (if any). However the
cmake step might still be alive and emits the dataAvailable signal which
then triggers the build process.

Task-number: QTCREATORBUG-18382
Change-Id: I956133fe8c6f7de58b9f842b231c70d24778b1e0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-20 13:37:58 +00:00
Claus Steuer
523439d71b CMake: The first build of a cmake project always fails in tealeaf mode
The TeaLeafReader tries to parse the CMakeCache.txt before cmake is
executed for the first time.

The error is signaled to the CMakeBuildStep which reports the build as a
failure.

Make TeaLeafReader::takeParsedConfiguration return an empty
CMakeConfig object if the CMakeCache.txt file does not exist instead,
but do not report an error.

Task-number: QTCREATORBUG-18290
Change-Id: Ibfc43858938477ae7479029e8fe6786c77823014
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-20 13:37:17 +00:00
Christian Kandeler
0652297f5a AppOutputPane: Do not reset the formatter after the RC has finished
Otherwise, clicking on links will have no effect. This feature was
broken with commit 113134b3b6.

Task-number: QTCREATORBUG-18134
Task-number: QTCREATORBUG-18334
Change-Id: I3cf5d8a9b3957a3f06cb3dbba40bb2dd16a9f8a9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-20 13:27:31 +00:00
Tobias Hunger
4e96f2ce22 MacroExpander: Prevent loop with subproviders
Prevent a loop where a subprovider of a macroexpander creates
the macroexpander itself.

Change-Id: Id2f3e29651aeb22c818091d8c785a6ea01545463
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-20 12:53:38 +00:00
Tobias Hunger
ba8e7d1156 CMake: Report more cmake errors in server mode
Handle more kinds of errors in CMake server-mode.

Task-number: QTCREATORBUG-18318
Change-Id: I43fff7f3cfbd86d01ff05a0936261b8d91aa5d70
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-06-20 12:52:34 +00:00