Commit Graph

58968 Commits

Author SHA1 Message Date
Alessandro Portale
65525a8001 Scroll Qt Quick Application Wizard: Enable minimal Qt version selection
This change makes the combobox for the minimal Qt Version in the
"Scroll" Qt Quick Application Wizard visible.

In contrast to the other Qt Quick Application Wizards, the "Scroll"
variant had the minimal Qt version selection hidden. That was OK in the
initial wizard commit, where only one Qt Version would have been
selectable. But with the subsequent additions of Qt Versions in the
wizard.json, the combobox visibility should have been changed to true.

The consequence of the invisible combobox was that the default was
secretly selected. The default was Qt 5.10 for a while. But the default
changed recently with 52f95bae8b and
caused QTCREATORBUG-22245.

Task-number: QTCREATORBUG-22245
Change-Id: If4d2f384a28bf3dd130b097022ea6d8d30ef7509
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-04-03 05:40:55 +00:00
Luca Carlon
79897316bc Suffix project user file with value of QTC_EXTENSION if present
Value of environment variable QTC_EXTENSION used to be appended to
the name of the project user file. This patch brings back the old
behavior.

Change-Id: I5d15fd529b056f1a96a561924a41ae62ae4b2681
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
(cherry picked from commit 04f8c0946f)
2019-04-02 22:03:56 +00:00
Alessandro Portale
ed87b74a59 qtcreatorcdbext: Fix "error: exists(file) requires one argument."
Change-Id: I7aff358618c25f1a815530355dca766a1a53259e
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-04-02 17:03:34 +00:00
Christian Kandeler
b9ae4c7ad0 ProjectExplorer: Do not auto-remove manually added toolchains
Fixes: QTCREATORBUG-22128
Change-Id: I73dff369542b6918bcb96fb7d028822e5aed2062
Reviewed-by: hjk <hjk@qt.io>
2019-04-02 14:38:44 +00:00
Thomas Hartmann
ebe76c6810 QmlDesigner: Fix icons
Task-number: QDS-538
Change-Id: If827453b95d76b20094ed83ec0673604ed7b188a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-04-02 14:20:38 +00:00
Leena Miettinen
bb9869dd7f Doc: Add missing info about options in Projects sidebar view
Change-Id: Ide060217020cac1787e7c320be66f6283f08845f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-02 14:14:31 +00:00
Christian Kandeler
4fff24849d ProjectExplorer: Fix toolchain autotests
Amends 9d5e38dbbb.

Change-Id: I8be6396456838e0b19cea433b2d60b702d8a1cd9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-04-02 13:37:09 +00:00
Kavindra Palaraja
198f3cbae4 Doc: Simplify the text that invites a developer to take a UI tour
Change-Id: Ib8ee635bf6eba8d4a80a0b0b5e0dfa9c6d04fe7e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-04-02 13:12:00 +00:00
Eike Ziller
73da3d3bc0 Restore success states after failed build
Fix up of 966f4ea6a9

Fixes: QTCREATORBUG-22211
Change-Id: Ia5648c0cf06fb7a12ec34c9683607f7c221965c3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-02 13:10:17 +00:00
Thomas Hartmann
d098016bd9 QmlDesigner: Avoid jumping cursors in integrated text editor
If the curser changes this should not trigger an update in
the other direction.

Change-Id: Ie20914f5587525f46f2941de21374f4373cec47f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-04-02 13:10:13 +00:00
Marco Bubke
56b01f7463 Clang: Minimize reindexing
We optimal indexer is only reindexing if the index would be changed. This
patch is a step in that direction. We only reindex now if the file or
project has changed. It fixes some typos too.

Task-number: QTCREATORBUG-21150
Change-Id: I6ea1c13282fbcd70253b9b2939aed37580dbd160
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-04-02 13:08:44 +00:00
Eike Ziller
257e45b4ec Merge "Merge remote-tracking branch 'origin/4.8' into 4.9" into 4.9 2019-04-02 12:53:37 +00:00
hjk
f7c350d782 TreeView: Fix mapping to source models in case ProxyModels are involved
Visible e.g. in context menu handling of the debugger's module view.

Change-Id: I342ed262c9e3dcdf98590003a7930cb8ef4ca0d2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-04-02 12:53:29 +00:00
Eike Ziller
ac24380c34 Merge remote-tracking branch 'origin/4.8' into 4.9
Change-Id: I90a3c1d29fccc4290311237d8680eaddb3cb5915
2019-04-02 14:53:16 +02:00
Marco Bubke
7595c9f305 ClangPchManager: Handle non generated PCHs
Sometimes we start generation of PCHs but not finish it. In that case we
should redo it at the next start of the backend process. So we now
remove the old precompiled header if we add the task to the queue.
If we successfully generated the PCH it will be set again. But if we
did not it will be read from the database and set to false.

Task-number: QTCREATORBUG-22035
Change-Id: Id53c2b4e4f501fc5ef7830558085607baa6a49f1
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-04-02 12:38:12 +00:00
Orgad Shaneh
acbd1d006c BranchAddDialog: Simplify a bit
* Remove redundant "Checkbox" translatable string.
* Hide "Track remote" checkbox by default.

Change-Id: Iec72d035e7b5493b320f8c21dd2f1b90eed0b5e6
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2019-04-02 12:34:17 +00:00
Christian Kandeler
9d5e38dbbb ProjectExplorer: Do not set up a 64-bit mingw as a 32-bit toolchain
The mingw toolchain is typically shipped explicitly as a 32-bit or 64-
bit package, alongside matching libraries. Therefore, it makes little
sense to set up a 64-bit mingw compiler as a 32-bit toolchain, even
though it can create 32-bit objects.

Task-number: QTCREATORBUG-22160
Change-Id: I9437801741b146785fecb0c0dd4b1db21ef94918
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-04-02 12:18:20 +00:00
Cristian Maureira-Fredes
000273b3f8 Fix double source category
Added a new entry to the FileType to support
Python source files.

Change-Id: Ic777d39045125ab46c953bfbc6320bd625e9cf01
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-02 12:14:17 +00:00
Ivan Donchevskii
bb3f890a84 Fix build with LibTooling
Change-Id: Iad8ab423c3d0f05e5c065f00d471bf6b778081f5
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-04-02 12:06:48 +00:00
Robert Loehning
5ca9ac4777 Fix wrong German translations
Change-Id: I9f932f1df93d723d5dc38bcee4f6ad6a4c653a7f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2019-04-02 11:43:06 +00:00
Robert Loehning
c24fb7c9e9 Squish: Update expected project tree for qbs
Change-Id: Ic6fc1afb7d9ccac526928f596d160573c67be97e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-02 11:42:28 +00:00
Ivan Donchevskii
6f745e0a4d ClangFormat: Do not remove whitespace twice
Previously the built-in engine was responsible for
clearing the extra whitespace. When ClangFormat plugin
is active and "Format edited code on file save" is selected
it clears the unnecessary whitespace on it's own and
we don't need to adjust the whitespace the second time.

Fixes: QTCREATORBUG-22239
Change-Id: I309f51c51aca8ab85b5cfb7809923b59a912b4e0
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-04-02 11:33:30 +00:00
Ivan Donchevskii
01a528c77a ClangFormat: Fix indentation when empty lines are involved
Unify continuation and new statement to get less false indentations.
Handle one-statement if/else as a special case.
Properly handle empty lines after
 - includes
 - preprocessor directives
 - beginning of the file
 - if/else

Fixes: QTCREATORBUG-22238
Change-Id: Ic334eeca7de47d9fcb74963d2e31711838d04bde
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-04-02 11:32:39 +00:00
Ivan Donchevskii
07557016f8 ClangFormat: Use the global style if no configuration is found
If no .clang-format file can be found and the settings do not
override the configuration neither globally not in the project
then construct the global settings (if required) and use them
instead of constructing the style every time.

Task-number: QTCREATORBUG-22144
Change-Id: Ib59b7f166f030ce3fb085f105f30fbf0eb25b185
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-04-02 11:32:11 +00:00
Ivan Donchevskii
c1d03e610c ClangFormat: Fix showing the warning text
The call to show() was lost at some point, let's restore it.

Change-Id: I83f551d26e6c4f658426b1196ff3a0935aea7047
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-04-02 11:31:35 +00:00
David Schulz
7f348c1878 LanguageClient: Compare expanded arguments for stdio clients
Change-Id: I6b33aa6b3ddb03a1965dbda4e7e1e1724299eba1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-02 11:29:47 +00:00
Christian Kandeler
5327d415a3 ProjectExplorer: Let user configure whether to close files with projects
Fixes: QTCREATORBUG-22198
Change-Id: I1143c58f66a658541cce013515a6b8f5a8245519
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-04-02 11:15:19 +00:00
Christian Kandeler
e8b31d388d GNU make parser: Be more conservative about creating error tasks
We categorized all stderr output that did not include the string
"warning" as an error. Let's reverse the logic and check for well-known
error strings instead.

Fixes: QTCREATORBUG-22171
Change-Id: I7ac2b973acdc0fb1f45edb43cd25fd0cebb9c74d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-04-02 10:55:32 +00:00
David Schulz
e618b158f8 LanguageClient: return actual settings instead of fallback settings
Change-Id: Ia0734c07ae5894d6c5c3e1f9c78e213f9422b6d8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-02 10:53:43 +00:00
Eike Ziller
b5e7522237 Merge remote-tracking branch 'origin/4.9'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/pythoneditor/pythoneditorplugin.cpp

Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6
2019-04-02 12:22:48 +02:00
hjk
841bbfa7bf ProjectExplorer: Switch order of template parameters
... of SimpleRunWorkerFactory.

This requires being explicit about the SimpleTargetRunner worker
default, but makes the template re-usable for current users of
RunWorker::registerWorker() which I would like to phase out now,
for less variations in the RunWorkerFactory setup.

Change-Id: I32638437e5bb29f143650f5fde706711ab25accf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-02 09:46:48 +00:00
David Schulz
73fbaea036 LanguageClient: support dynamic registration for more functions
Change-Id: Iaa49c96195b04ebf72f54698bc070fa0bcaa6311
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-02 08:49:52 +00:00
Alessandro Portale
904ad4763f SharedContent: Update share.qbs
Change-Id: I07a3c5db37459c5bf1b6219a5d58f88e6346ca43
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-02 08:28:26 +00:00
Christian Kandeler
f30d27b10f QmakePM: Find prf files for CONFIG values
... in the pro file editor.
When the user selects "Jump to file under cursor" (e.g. via F2), and the
string under the cursor is not resolvable as a local file path, we
assume it is a CONFIG value and try to locate a corresponding prf file.
To this end, we expose the "feature roots" information of the qmake
evaluator in the QmakeProFile class.

Fixes: QTCREATORBUG-15753
Change-Id: Ibdc6e194a40f07030a5d21f2ddc7b92b63d1765b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-04-02 08:23:57 +00:00
Christian Kandeler
3726218b5e Debugger: Restrict the file name pattern of potential lldb executables
We now try executables such as lldb-7 or lldb-1024, but not e.g. lldb-
vscode, which used to time out the autodetection code.

Change-Id: Iac3b6c4d55d34ee98073f99c8e8341011845ca92
Reviewed-by: hjk <hjk@qt.io>
2019-04-02 08:23:14 +00:00
David Schulz
ffcf226a78 LSP: generate capabilities in a central place
Also remove the creator default capabilities from the default
constructor of the general client capabilities in Utils.

Change-Id: Ifdaaf1bfb5047197e37ba84773552648132df3e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-02 07:57:23 +00:00
David Schulz
35baa3e89d LanguageClient: send project folder on server request
The server can request the list of opened projects via the
"workspace/workspaceFolders" request. Add a creator response for
this request.

Change-Id: Ieadf604aeb920da28f085b8441e6f9af1f540fd3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-02 07:57:16 +00:00
hjk
ad889d6707 Debugger: Avoid looking up QList<QFileInfo> in QDir dumper
Task-number: QTCREATORBUG-22000
Change-Id: Ibb24dc81282118c1f6fe97af451647a54ffcc8dd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-04-02 06:38:44 +00:00
Christian Stenger
eecbef31ff QmlDesigner: Fix compile before Qt5.12
Change-Id: I7b6250522df27289209c60bd6f99f70a470b580f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-04-02 06:12:39 +00:00
Thomas Hartmann
36bb83e05b QmlDesigner: nodeAtTextCursorPosition use simple linear search
The recursive version had some issues with corner cases.
The speed gain is not worth the extra complexity, since
the not unrealistic worst case is a list of nodes anyway.

Task-number: QDS-537
Change-Id: Ia3f74fdba041d81bdf6b8951482160a9229bd9e5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-04-01 20:44:30 +00:00
Thomas Hartmann
d4b96c765b QmlDesigner: Remember last location when importing resources
Task-number: QDS-499
Change-Id: I0645ff568d634f2675d8ac70f7617c52abcafb18
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-04-01 16:53:09 +00:00
Frederik Schwarzer
b767e9895f fix Gamepad import casing
Change-Id: Ifde9c018eb930dd80f520aa2c52ea26ab968a4bd
Fixes: QTCREATORBUG-22224
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-04-01 16:48:59 +00:00
Thomas Hartmann
231d3f6d40 QmlDesigner: Use proper default icon for types
Task-number: QDS-293
Change-Id: Ia2dcab06fa96106bcd909ce2067e81ecc610fc97
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-04-01 15:50:23 +00:00
Orgad Shaneh
f1665c02aa OutputFormatter: Fix behavior of text with different format after \r
For example, git rebase for outdated Git versions has:
stdout: Rebasing (1/2)\r
stdout: Rebasing (2/2)\r
stderr: Successfully rebased and updated refs/heads/master.\n

The stderr is supposed to overwrite the Rebasing line. Without
redirections, this is what you get on the terminal.

Conform to that by deleting a line that ends with \r even if the next
output has different format.

The only exception is when the following *starts with* \n. On this case, it
will behave as \r\n, meaning it will *not* overwrite the previous line, and
will continue on the next line.

This amends commit 79cfb784be.

Fixes: QTCREATORBUG-22179
Change-Id: I4208008095f3e186aa9b4cee99fa5cd807ffdbcb
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-01 15:31:44 +00:00
Thomas Hartmann
346b5aa4ad QmlDesigner: Use AdaptiveDecimalStepType in timeline DoubleSpinBox
This is something we might consider for the Qt Quick Controls,
since we have controls where a pre defined step size does not
make much sense, or we simply do not know the step size.

Adaptive decimal step means that the step size will continuously
be adjusted to one power of ten below the current value.
So when the value is 1100, the step is set to 100,
so stepping up once increases it to 1200. For 1200
stepping up takes it to 1300. For negative values,
stepping down from -1100 goes to -1200.

Task-number: QDS-534
Change-Id: I18d3cb43e4fa140d94336b5128c4f1f6707880dd
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-04-01 14:05:49 +00:00
Leena Miettinen
2221ef04fe Doc: Update FakeVim command line mode options
- Add and remove options
- Add short names for all options
- Add arguments for the options that take them

Change-Id: I3d1e96a87ddfecff69193c0a87bc76e33d2ab66c
Reviewed-by: hjk <hjk@qt.io>
2019-04-01 13:39:41 +00:00
Leena Miettinen
28d2cc93e0 Doc: Describe the debugger Load Core File dialog
Change-Id: I6e98c3420d6142d230181efe8e764040f8154f7b
Reviewed-by: hjk <hjk@qt.io>
2019-04-01 13:27:41 +00:00
hjk
c58d56a69f Debugger: Add dumper test for QDir's entryList and entryInfoList
Change-Id: Id3145d0e385120926ef5ff9d8acc743de5b000a8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-01 11:58:08 +00:00
Cristian Adam
5738d40030 Clang Backend: enable Windows debug logging
On Windows the debug messages are not sent to the Windows logger, because a
custom Qt message handler was set up.

This commit forwards the messages also to the default message handler.

Change-Id: I1745a86f72fcc1e48cd52603633fca2f23c8fedf
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-04-01 11:22:54 +00:00
Robert Loehning
f35532add8 German translation: an Stelle -> statt
Change-Id: Ib0385a9447b585c7c147c8471c829093d7ae4404
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
2019-04-01 10:55:09 +00:00