Commit Graph

53197 Commits

Author SHA1 Message Date
hjk
36ec37b29d Debugger: Streamline ramping down
There were only two used target states, and in case of mixed
debugging all parts of the machinery better agree on the
direction. So one bool in the (shared) runTool is sufficient.

Change-Id: Iffbf1651b82dde707cfc37d8da9d3da573b34b76
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-19 09:56:49 +00:00
Orgad Shaneh
ded514cf05 CppEditor: Fix infinite loop on "find next" in include hierarchy
Change-Id: I8ee661b2d4b66704d85dd55cdd52f9e8c8d558d5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2017-05-19 09:54:03 +00:00
Nikolai Kosjar
abc7f2fa61 GccToolChain: Do not deadlock on compiler path changes
Make sure mutex is recursive.

Task-number: QTCREATORBUG-18175
Change-Id: I357ff46e185a99540036b2c175650704fb8e45a0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-19 08:53:25 +00:00
Tobias Hunger
9e43814b13 RemoteLinux: Fix build warnings about inconsistent use of override
Change-Id: I58d53f05fbaa18763ad3198235004f6081da71b7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-05-19 08:34:43 +00:00
Tobias Hunger
6886b59fe6 CMake: Filter duplicate files from tree in tealeaf mode
Task-number: QTCREATORBUG-17955
Change-Id: Ibd19c7a0d398f3f26d63983ec024722933485513
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-19 08:01:50 +00:00
Ivan Donchevskii
5e84af54a0 Clang: fix incomplete include text underlining
Fix invalid include text selection.

Task-number: QTCREATORBUG-15471
Change-Id: Ifbe00a7215f2307648e815cb283691496d02c4d0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-05-19 07:47:16 +00:00
Orgad Shaneh
3490e67a49 FindInFiles: Support relative path based on the current project
Task-number: QTCREATORBUG-18139
Change-Id: Icffbba7f9db4514b986f0414a9f7a834d4da39c6
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-19 07:34:33 +00:00
Orgad Shaneh
5368e29050 PathChooser: Avoid unneeded validation when base is unchanged
Change-Id: Ia4b00d673725ff3718dbc9703c933a44fe2314dc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-19 06:55:53 +00:00
Orgad Shaneh
aae55000db GenericHighlighter: Remove invalid entries in makefile.xml
Those keywords are mapped to undefined lists.

Reported in https://phabricator.kde.org/D3621#inline-17949

Change-Id: I5d5fc654afe2e35577175a0e3fa2196555ee4ada
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-19 06:28:20 +00:00
Orgad Shaneh
a4a146b3cb Move Git-specific logic from DiffEditor to Git
Change-Id: I29466c26a51844bb975ac3ecb68adf708021aa67
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-05-19 04:48:23 +00:00
Andre Hartmann
744285c3fc SubmitFileModel: Remove commented code
Change-Id: I6806ff0d724dc40559a980cd09aa9ae9e32ebaab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-19 04:24:53 +00:00
Andre Hartmann
a396c79702 SubmitFileModel: Change enum naming according coding style
Change-Id: I2b2b37c8125076374c69cc638f1e9611dff27a8c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-19 04:24:41 +00:00
Andre Hartmann
9e2952cf8e SubmitFileModel: Whitespace cleanup
Change-Id: I93a4d07efd7acd06d72372da7679a8e71b00a8e3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-19 04:24:13 +00:00
Andre Hartmann
7e45c2e7e2 SubmitFileModel: Remove Q_FOREACH
Change-Id: Ie6cb01f6873ea3c438068d2963a648f0979f7133
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-19 04:23:40 +00:00
Andre Hartmann
ca95965b27 SubmitFileModel: Simplify list construction
Change-Id: Ie59501ec245020666e59b41b9690a562538cd69c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-19 04:23:26 +00:00
Andre Hartmann
eff6f2cebb SubmitFileModel: Remove unneeded qualification
Change-Id: Iae3f87cda1ad4c58054a324f9b822daaacb63fb2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-19 04:23:12 +00:00
David Schulz
f811cff769 Debugger: Execute extra dumper commands after cdb start
Change-Id: I3dfc803695ffaa04d719103d8bec59ce8b4f08e5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-05-18 13:07:52 +00:00
Christian Stenger
dc873311e5 CPaster: Fix fetching from pastebin.ca
Change-Id: If41c89dddfd556607dccd940f289408012680e82
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-05-18 12:36:47 +00:00
Robert Loehning
ae4be183fd Squish: Tune tst_codepasting to working cases
Change-Id: Iaa7ebcbc20f096d1776be13c62978d6851707d39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-18 12:35:42 +00:00
Robert Loehning
d9e1c77c01 Squish: Shorten object names
Change-Id: Ic57dce86bccae23a2edeee42207a872793feffa0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-18 12:26:18 +00:00
Vikas Pachdha
0093e4a263 Android: Fix android kit missing compiler on NDK path change
Task-number: QTCREATORBUG-18221
Change-Id: I4481d252064476f905a02a53c487664f3e1d4a4c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-18 10:51:19 +00:00
Kari Oikarinen
9ea07a2fbc RemoteLinux: Don't force value for DISPLAY in base environment
When set on nVidia Jetson TX-1, it leads to applications failing.

To allow previously created projects to work, add DISPLAY=:0.0 to user
changes to the base environment the first time the project is loaded. On
new projects for devices using X11 the user now has to manually set the
DISPLAY variable.

Task-number: QTBUG-60665
Change-Id: Iecc192fbad81ad5cbbbcabce6aeb28c3f501d022
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-18 10:09:16 +00:00
Tor Arne Vestbø
4eac9533e1 Make sure lldbbridge.fromNativeValue always sets value name
Change-Id: I40296843bcbc504d6271a1f30ac4f8c4a1a2fe85
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-18 09:33:54 +00:00
Tobias Hunger
6dc6eb9ad0 ProjectNodes: Make FolderNode::replaceSubtree safer
Make it safe for an existing note to replace itself.

Change-Id: I8ce04ea45cb851c814b9efbc7d8490c5fb44150e
Reviewed-by: hjk <hjk@qt.io>
2017-05-18 09:19:11 +00:00
Eike Ziller
ee722a047c DiffEditor: Fix editor actions
The text editor widgets all need a TextEditorActionHandler that takes
care of the editor actions for them.
Each text editor needs its own context, so the editor with focus
receives the actions. This does not happen automatically for these text
editors, since the diff editor manages these itself.

Task-number: QTCREATORBUG-9445
Change-Id: Ib42f095ec23550e401e8ee9b36f3f49517a22877
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-18 08:24:26 +00:00
Eike Ziller
fd7edcb826 TextEditorActionHandler: Use configuration instead of inheritance
Avoids creating subclasses just for implementing a single method.

Change-Id: I813a0a20eaba8fefa004b74f92d48a9a9c4bfcc1
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-18 08:24:20 +00:00
Eike Ziller
2684254fad Fix text based Android manifest editor actions
All text editor actions were disabled. We want the actions to be enabled
when the focus is in the text editor widget in the Android manifest
editor.

For this the text editor action handler must differentiate between the
_editor_ and the _context_ that it handles. The one for the text based
manifest editor handles the manifest editor, but the context is specific
to the text editor part.

Change-Id: Ib91cc763cb27333a7d5b6e5b036dfead33961871
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-18 07:08:56 +00:00
hjk
1f6764a54e Debugger: Move run parameters from engine to tool runner
The parameters belong to the run control, they should not
be triplicated in case of a combined engine.

Change-Id: I4dd84220edbd7a44b902cc52627fe01d0568db75
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-18 07:05:09 +00:00
Eike Ziller
c9cd6b1223 TextEditor: Disable "duplicate selection" actions for read-only editors
Change-Id: Iea2cf0c05e1561fce3b6195e0f28a6086c30e217
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-18 06:26:33 +00:00
Eike Ziller
27a9fd7e7a TextEditor: Sort list of modifying actions
Change-Id: I7b5c8e03b7da18ea136210384f84355599618f40
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-18 06:26:19 +00:00
Eike Ziller
01a4d76cc1 Re-enable fast concatenation on macOS again
The old compilers that had issues with it should now long be unsupported

Change-Id: I49a30d1533814877ae4fde9c9bd4e3e64528dfa3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-18 06:24:31 +00:00
Felix Kälberer
accac479e0 CMake: Filter CMake variables
Add a text field to filter CMake variables in the CMake project
configuration view. As in the cmake-gui, the filter does a simple
string search over all variable names and values.

Task-number: QTCREATORBUG-17973
Change-Id: Id7219c16509c620c39978cb05c5e0e62cf9c19df
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-17 20:29:23 +00:00
Eike Ziller
03ca6a9172 Update changes file
Change-Id: Id1c21386cc01c349ff4d6712b1d546b8be994980
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-05-17 16:43:57 +00:00
Eike Ziller
4198952214 SyntaxHighlighter: Remove useless code branch
Change-Id: I20ea87cf43bae9540707c1e765e40e4baee93357
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-17 14:37:43 +00:00
Ivan Donchevskii
8679d8e9a9 TextEditor: fix underlined text Bg color
Set default bg color to NoBrush.
Previously caused incorrect painting when
underline style was set without background.

Task-number: QTCREATORBUG-18101
Change-Id: I4c1d86a3c711a3962e01ccf3a937dafa36b68ec2
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-17 11:51:47 +00:00
Tobias Hunger
83f1f0a57e Qmake: Make sure SOURCES get proper file types
The side-effect is that .qrc-files that get put into SOURCES by qmake
will be handled properly.

Task-number: QTCREATORBUG-17521
Change-Id: I2a002f1fd5f242c345418b37f20060961e8927b0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-17 11:37:18 +00:00
Tobias Hunger
8e87f32eeb Resources: Trigger watcher when changing qrc file
Trigger the filesystem watcher when changing qrc files. This in turn
triggers a reload and with that a refresh of the project tree.

Task-number: QTCREATORBUG-17930
Change-Id: If1aa0ee6ded86594a8c35880b56e76e05e0fa214
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-17 11:32:02 +00:00
Tobias Hunger
800d5822ef Resources: Read qrc file contents from file if that is readable
Retrieve the qrc file contents from the file if that is readable. This
is now necessary since the ResourceTopLevelNode now contains the QRC
file contents itself so the QML code model has access to it, even if
a qrc file is actually used.

This fixes one part of QTCREATORBUG-17930

Task-number: QTCREATORBUG-17930
Change-Id: I0e8cc8828062f079d8634882a768ca60331a0e16
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-17 11:31:56 +00:00
Nikita Baryshnikov
4f8ec92c80 ModelTest: fix sign-compare warning
Change-Id: I057ebdd367f91544e68c71c225a3984c3ef64fdd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-17 10:08:01 +00:00
Tobias Hunger
4c472e790b Debugger: Prefer debuggers in PATH to others when setting up kits
Task-number: QTCREATORBUG-18188
Change-Id: Iaee65491cca5d7a66b6fbb70c2500395a995790d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-17 09:26:43 +00:00
Leena Miettinen
3e9f1672b7 Doc: Describe selecting Change to edit the CMake generator
Change-Id: Ieaf952d8cfb9ff14c99d76d0b6d7b3b99c6c2e96
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-17 08:40:11 +00:00
Orgad Shaneh
9acad59778 ProjectExplorer: Do not try to resolve file name for internals
like <command line> or <built-in>.

Change-Id: I7d0dc63b2ce54f8d92cba248d504d8124a3689a7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-17 08:25:02 +00:00
Tobias Hunger
db4b145536 Qmake: Suppress spurious warnings about compiler mismatch on Apple
Suppress spurious warnings about compiler mismatches on Apple all the time
at the cost of potentially supressing some real issues.

Task-number: QTCREATORBUG-17794
Change-Id: I7bef3b8065de676d625905f3bf9936c91094b04f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-17 08:22:34 +00:00
Orgad Shaneh
dfa7e492a1 Debugger: Move debugging helpers settings to Locals & Expressions
They're no longer GDB only.

Change-Id: I3aa00be50c85a90c8f81ab9c04c6bb0ec74b7785
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-17 07:45:21 +00:00
Friedemann Kleint
c7a84634fd MsvcToolChain: Cache the environment modification
Introduce a cache storing the environment modification
as a list of EnvironmentItem.
This saves quite a few invocations of the vcvars.bat
during loading projects, speeding it up.

Change-Id: Ica27495fe96db4dd683e68746559701cc3e30428
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-05-17 06:43:45 +00:00
Andre Hartmann
b60c02bcc0 SearchResultWidget: Re-layout replace options and Replace button
Placing the extra options (Preserve Case and Rename Files) left
to the Replace button looks more natural (you have to check them
*before* pressing Replace.

As benefit, the tab order automatically goes from the replace
edit to the tree and from there through the extra options to
the Replace button.

Change-Id: I922b65f6e033a8db7a0a218aba3a714cef9fbc32
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-05-16 16:04:39 +00:00
Daniel Teske
ef951eaea7 Class Renaming: Offer to rename files that match the symbols name
Task-number: QTCREATORBUG-14696
Change-Id: I6d140dac510e47d1a19d6759148f5f24dad44062
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-16 16:04:17 +00:00
Orgad Shaneh
6d6c0c81ed Tests: Minor cleanup in debugger/simple_test_app
* Replace double casts with ll suffix, which resolves the warning.
* Replace recurring shifts by using a local variable.

Change-Id: I344fab50619dc27e68a151abb2f3061543c36662
Reviewed-by: hjk <hjk@qt.io>
2017-05-16 14:18:49 +00:00
Eike Ziller
eb184ff052 Fix filtering and sorting of Qt versions in examples browser
Use the list of filtered Qt versions instead of the global complete list
at several places.

Broke with f1bc4ade50

Task-number: QTCREATORBUG-18216
Change-Id: I274197c833d5786b279a030c3f804286382a9c2c
Reviewed-by: hjk <hjk@qt.io>
2017-05-16 14:18:12 +00:00
hjk
d728317c87 Debugger: Add a dumper for QProcEnvKey
Makes spotting variables in the process environment easier.

Change-Id: I5841cf299840082ff62d96bcb57386a0352ee08d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-16 14:17:33 +00:00