Commit Graph

54723 Commits

Author SHA1 Message Date
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
Nikolai Kosjar
9cb02d1663 CppEditor: Fix condition for Obj-C keyword highlighting
Change-Id: I3fb8bf46fffbb0b41ef532996a21f03d2d48a9c1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-05-16 14:10:39 +00:00
Nikolai Kosjar
837cb2e397 CppEditor: Do not highlight C++ and Qt keywords for C
Task-number: QTCREATORBUG-2818
Task-number: QTCREATORBUG-18004
Change-Id: Ibca60a1711c827dd8b4c0486bff3d49b19a61d8b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-16 14:06:04 +00:00
Friedemann Kleint
cf807253e4 QML application wizards: Add code to bail out on load errors
When something goes wrong with deployment or there is a syntax
error in the QML files, the old code would enter the main
loop not showing any windows. Worse, the binary is then locked
on Windows and cannot be overwritten. Add a clause checking
whether there are any root objects and bail out on failure.

Task-number: QTBUG-60764
Change-Id: I3620a09ec4331dc04a5194dfd2ece2ff44bdc429
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-05-16 14:04:03 +00:00
Tor Arne Vestbø
5bc796094a Allow custom handling of python Dumper warnings/exceptions
Change-Id: I04108a09c317675d597bb6d0d58331c70ce02fb9
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-16 12:38:16 +00:00
hjk
99ac955664 Debugger: Fix display of pointers as arrays
Task-number: QTCREATORBUG-18204
Task-number: QTCREATORBUG-17803
Change-Id: I4efe359c206b53ef773127cf29107d3cce720819
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-16 11:55:58 +00:00
Kari Oikarinen
e763ce28e8 QmakeKitInformation: Leave new Boot2Qt Qt versions also alone
Original check was introduced in
200e7dd437, but in Boot2Qt 5.9 Qt versions
use a different id.

This lead to Emulator kits using system g++ on Linux instead of the
provided one. Possibly also other way (desktop using emulator g++).

Task-number: QTCREATORBUG-18169
Change-Id: I42f0da784ccaf749ce2eaba5d689bbdb8c11f971
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-16 10:48:51 +00:00
Eike Ziller
83b8c8fc15 Reduce CPU load of test parsing
Use a thread pool with reduced max thread count.

Task-number: QTCREATORBUG-18185
Change-Id: I18bd3de82365edaf21d8dcf9c89035da1ac74756
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-16 10:46:13 +00:00
Leena Miettinen
2dd48a2080 Doc: Update and reorganize Android development requirements
Change-Id: I61dec28ca16b4f4849a0c8c6da8002d3f3fe2ce9
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-05-16 07:26:07 +00:00
Christian Kandeler
6754514489 QbsProjectManager: Re-introduce install step
... in a modified variant. The install root is now taken from the build
step to ensure consistency.
A dedicated deploy step can be useful on Windows if one wants to rebuild
while the application is running.

Task-number: QTCREATORBUG-17958
Change-Id: I93bc59b0e6d954d61d84bcfc81576cdb4fac1216
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-05-16 07:19:22 +00:00
hjk
4dac9c40bb Valgrind: Announce 'started', not 'stopped' on startup
Also provide a name for the workers.

Change-Id: I323c498db1eeb8225170aae080fdf084aa53e14a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-16 06:03:05 +00:00
Thomas Hartmann
567a99c5aa QmlDesigner: Replace SwipeView with StackLayout
In the designer we replace a SwipeView with a StackLayout.
Form the perspektive of the designer they are the same
and StackLayout is easier to handle.

Change-Id: I308ec209024e22db9f56e363e27588a40283603c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-15 15:50:48 +00:00
Christian Kandeler
b9b3717007 RemoteLinux: Fix creation of environment aspect widget
This was forgotten in ae9fff17a1.

Task-number: QTCREATORBUG-18167
Change-Id: Ib1e3d06ee822dff6b991d967b2f68148cc9c55c6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-15 14:40:54 +00:00
hjk
89f02cba2c ProjectExplorer: Split Target and ToolRunners into smaller tasks
This increases re-usability of activities like 'port gathering',
and makes their use less dependent on actual device implementations.

Change-Id: I017cb74874f2b38c487ba2d03906a675d5618647
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-05-15 14:35:03 +00:00
Orgad Shaneh
f19de84e57 VCS: Quote command-line arguments
Change-Id: I49e776abe769b70d8003483215a4dbe31f60377b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-15 14:06:03 +00:00
Eike Ziller
964dd4a3e1 Add a way to redirect the "install settings"
If the default install settings contain a value for
"Settings/InstallSettings", then that is used as the actual path for the
actual install settings instead.

If the path is relative, it is interpreted as relative to Qt Creator's
applicationDirPath.

Change-Id: I212037112e88c60c94239580841aa1400d96fb73
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2017-05-15 13:47:37 +00:00
Eike Ziller
9b93d5a330 Merge "Merge remote-tracking branch 'origin/4.3'" 2017-05-15 13:32:48 +00:00
Eike Ziller
64b19af7dd Merge remote-tracking branch 'origin/4.3'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I6d89ea588de955f5d878500b59285d3adde6c77d
2017-05-15 15:31:55 +02:00
Daniel Teske
c7c61ce633 KeyWordsCompletion: Simplify code
Make the perform method stand alone by removing various members of the
class
and inlining various functions.

Change-Id: I57cc561f011aa813fbf548837ef0834fdb517118
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-15 13:31:40 +00:00
Orgad Shaneh
02d2b36ce7 Gerrit: Avoid UTF-8 in comments
When the default charset is not UTF-8, the editor fails to open this
file for write.

Change-Id: Idda8379e10ac48e3a5c1012a1c6b7b06ef5835e5
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-15 13:27:28 +00:00
Orgad Shaneh
689aa3891d CMake: Ignore dirty signal on server-mode on Windows
CMake sends false signals on Windows. Until this is fixed, ignore them.

Task-number: QTCREATORBUG-17944
Change-Id: If59f04fd68a899069ecc02df592d3105e531f5bb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-15 13:23:30 +00:00
Alessandro Portale
36c8227caf App: (Re-)enable automatic HighDPI scaling for Linux
The original reason for disabling HighDPI scaling on Linux in
7da2b4a3cb was unhinted fonts for non-
scaled scenario: QTBUG-46435. That issue had been fixed long ago:
0f7bc885aa7ae8cc3c448cc751aba4eba8c1c8b8

HighDPI support on Linux should by now be good enough to give it another
try by default.

Change-Id: I5b74f46310254c2916a2f16a7655d9f096453cc3
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-15 12:08:35 +00:00
Nikolai Kosjar
c9a9aadde7 QmlDesigner: Remove unused acceptedModelNodeChildren()
Change-Id: I3f584e94135852a1a3619fc2ebb877897a7eef60
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-05-15 11:23:15 +00:00
Orgad Shaneh
7e8bac1512 Gerrit: Terminate previous query when remote is changed
Change-Id: Ifafaa9068dca069562973151361e653f6db3617e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-15 08:19:59 +00:00
Christian Kandeler
4b38b09a81 Update qbs submodule
To HEAD of 1.8 branch.

Change-Id: Icebf0374b92612b7823d9e21b489205a94e34cc2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-05-15 07:42:55 +00:00