Commit Graph

68568 Commits

Author SHA1 Message Date
Knud Dollereder
caaad2107d Add minitrace library
Minitrace is a small C++ library used for adding trace points
into the code. When enabled with the build flag
BUILD_LIBRARY_MINITRACE set to true it will write a JSON file
containing these trace points to disk.
This file can be visualized with chromes builtin trace viewer
(about:tracing) which helps in profiling performance issues
and keeping track of performance regression.

Task-number: QDS-3766
Change-Id: I6109a72507b53c5e3ad8f9f504ff26a4fad206be
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-02-25 11:53:36 +00:00
Orgad Shaneh
35245a7fcf Debugger: Show Threads dock by default
Change-Id: I11480919b4bccab2f5472d4683a3ee81068cac71
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-02-25 10:38:43 +00:00
hjk
528f08cad1 QmlJS: Compile fix
Amends bd05384765.

Change-Id: I45475798cdc1d4de997e694596f0c18009241492
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-02-25 10:09:54 +00:00
Miikka Heikkinen
69087a2c4b QmlDesigner: Update selected imported node
Add context menu item for updating selected 3D node. If selected node
is a component created by import, that import is updated. Otherwise
if the open document itself is an imported component, update that
import. In the latter case, preselect the source file relevant for
the selected node.

Fixes: QDS-3738
Change-Id: Id678288893f1700648d084ba92df40844d2af0b5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-25 09:39:13 +00:00
Leena Miettinen
f51387fb8e Doc: Describe new context menu commands in Type Hierarchy view
Users can navigate in the type hierarchy and move to the class
definition in the editor.

Task-number: QTCREATORBUG-25162
Change-Id: I608538b24a3d6db25a0ed83d743a42e2d133dae4
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-02-25 08:53:57 +00:00
Fawzi Mohamed
bd05384765 qmljs: handle string templates in scanner
* add (multiline) template string support
  templates can be nested, which means that the scanner/lexer cannot
  be a simple state machine anymore, but should have a stack to store
  the state (the number of open braces in the current template
  string).
  The lexer stare is currently stored in an int, so we abuse that and
  store a the number of open braces (maximum 0x7f = 127) for at most 5
  nested templates in the int after the flags for the multiline
  comments and strings.
* improve representation of delimiters (==, <=, ||,... not split in
separate delimiters)
* (QmlDom backport)

Change-Id: I2b4d23b65febedef29a748f4c5f377fde27bd7fd
Fixes: QTCREATORBUG-22766
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-02-25 08:37:12 +00:00
Christian Stenger
de04f29198 Squish: Wait for the docs update progress bar
Change-Id: I73e80119a7e5a8d09397138d1301154af597f907
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-02-25 08:02:37 +00:00
Eike Ziller
28d6be9867 Bump version to 4.16.0-beta1
Change-Id: I5fda5f867273d27c41b8d07371b0bd01e8e851dd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-02-24 18:55:05 +00:00
Eike Ziller
d17c9d03e9 Merge remote-tracking branch 'origin/4.15'
Change-Id: I4460bd05582ea3cfb561374ed8e6a9fcb983caf4
2021-02-24 19:51:54 +01:00
Eike Ziller
fc5af03862 Bump version to 4.14.2
Change-Id: I792587c71eadf0b2602d73e7fa4be324cc2766cf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-02-24 18:51:04 +00:00
Eike Ziller
cc21658170 Merge remote-tracking branch 'origin/master' into 4.15
Change-Id: Ia313b9a8bf82940e496b7456801faf552fe4b022
2021-02-24 19:42:30 +01:00
Eike Ziller
c5d4515ec1 build.py: Make it possible to skip building Qt Creator
And only build the windows tools qtcreatorcdbext and wininterrupt.
For minimal 32bit Windows build.

Change-Id: I126c0963a8917c95300c0b2e9f00da274a62887d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-02-24 16:07:49 +00:00
Cristian Adam
145be455ee CMakeProjectManager: Add Batch Edit support for CMake configuration
For the initial CMake parameters one can have an edit dialog. Now it's
possible to batch edit variables also after the project has been
configured.

Change-Id: I406b8e7db16147032a75c82fddf9b7acec85c4bf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-02-24 15:33:25 +00:00
Vikas Pachdha
fbf509dd0b QmlDesigner: Fix designer's unit tests
Change-Id: I8da4b6d62beef6e4101fbc331d9877ac7bb0398c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-24 14:04:38 +00:00
Eike Ziller
6608bf1ad5 Merge remote-tracking branch 'origin/4.15'
Change-Id: I65e889663dac29a2efd85eba35bdb39a6611c801
2021-02-24 13:57:54 +01:00
Eike Ziller
52e0cb6623 Merge remote-tracking branch 'origin/4.14' into 4.15
Change-Id: Ia86c8b94a7d57eb3312600b1d7e9f4fe20185b45
2021-02-24 13:22:14 +01:00
Christian Kandeler
f9efff42e1 LanguageClient: Fix DocumentOnTypeFormattingRequest interface
Change-Id: Ib84f6c475e5bf2faff395d60d4c3b42b0a9d7017
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-02-24 10:57:40 +00:00
Alessandro Portale
b2b6c64e6a Don't detach temporary containers
Change-Id: I736cfc61c81995a81b056b3e3e5703ded5912525
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-02-24 08:27:10 +00:00
Alessandro Portale
14162aae9f Remove conanfile.txt
It is outdated and was not noticed until Qt Creator started processing
present conanfile.txt files.

Change-Id: I3ae273d50cb6ba34cdaca0d952acaa68d3db659e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-02-23 18:13:29 +00:00
Alessandro Portale
173a5b97dd qmake build system: Install share/3rdparty/package-manager
Amends: cc0fa86ffd

Change-Id: I00ca24fa18a10ff9bbbdeb86262c24c32d8dd8f8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-02-23 16:04:26 +00:00
Mahmoud Badri
4bdc4cf9c7 QmlDesigner: Fix flow tags cleanup regression
Caused by: 58b3afa728

Change-Id: I2cb52801f7d7ad9d7d4382f81ad9e52cae16fd03
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-02-23 15:07:46 +00:00
David Schulz
925c4a3198 Android: Add path to Qt java bindings to project files
Change-Id: Ia3ee35732bece5870659cac338f26f815e3ce566
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-02-23 14:46:02 +00:00
David Schulz
3c80f1bd9d Android: Add 3rdparty jars to classpaths
Change-Id: Ibc645e2377d4cb6d5eddd86d77cbb7f8ca294f1f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-02-23 14:41:01 +00:00
Mahmoud Badri
58b3afa728 QmlDesigner: Clean up flow tags remainings
Remove the remaining unused code related to flow tags. Flow tags feature
was removed as part of the new item library ui commit:
151184a609

Change-Id: Ic2f518cb7d345d4f5a183194bebb29c76b227c15
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-02-23 14:01:47 +00:00
Eike Ziller
cc0d70dd99 build.py: Build wininterrupt and qtcreatorcdbext separately
The build of wininterrupt and qtcreatorcdbext was using the fully
configured & built Qt Creator as a base. Now that we have separate CMake
projects for these tools, build them really separately.

This will be needed for building them on Windows 32bit for the Qt 6
build, since that doesn't provide Qt builds on that platform anymore.

Change-Id: I50a662c6366814cbb6f4ce62adca2c1c3e9d546f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-02-23 13:56:46 +00:00
Eike Ziller
28a8516394 CMake build: Make it possible to separately build wininterrupt & cdbext
By making them separate projects. Follow the pattern from sdktool.
This is needed for building these tools on Windows 32bit for the
Qt6-based installers - because Qt 6 doesn't provide Windows 32bit
builds anymore.

Change-Id: I82e2fdc7312e95079bb13f8c5f0ac1028c09222f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-02-23 13:56:33 +00:00
Mahmoud Badri
83c61a7c53 QmlDesigner: 2 item library import section improvements
- Move imports with no categories to the bottom of the list.
- Remove the project import from the list.

Change-Id: I41d229bb776bfe845dadbfc5c1be5b7d50aeee3e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-02-23 12:49:57 +00:00
David Schulz
d46d53de1f LanguageClient: reset project pointer when project is closed
Change-Id: I9a2787404bd47bf338125df1066d88e9061b5768
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-02-23 12:46:22 +00:00
Fawzi Mohamed
6929935111 designercore/imagecache: avoid missing override warning
Change-Id: Ic9bfdb9041dd82f78e56886793fd43d91955d2b7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-02-23 12:39:19 +00:00
Fawzi Mohamed
c0f9f29097 qmljs: correctly reformat js spread operator (...)
Fixes: QTCREATORBUG-23402
Change-Id: I6b4bd0846dac67116711b7ed046bd52d137b7674
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-02-23 12:38:55 +00:00
Mahmoud Badri
7d3ba0587f QmlDesigner: Fix item library expand issue
If a click happens on an item library item, mouse interaction
(expanding, collapsing sections, and showing context menu) is blocked
until some action happens (right-click for example). This is due
to a bug in QDrag. With this commit it is very hard to reproduce the
issue unless one's deliberately insisting to reproduce it.

Fixes: QDS-3792
Fixes: QDS-1652
Change-Id: I201b07aabf144adbb4d51e32c1fcc4990f89f5f9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-02-23 12:25:22 +00:00
Leena Miettinen
3dfb866bab Doc: Fix broken links
By hiding them if the link target is not part of the manual
or by fixing the link target if the section heading changed.

Change-Id: Ib72c71852ea3f8dacbfedb71a94d64d3eb5378fb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-02-23 11:53:12 +00:00
Miikka Heikkinen
8b8fc8458a QmlDesigner: Allow partially overwriting 3D imports
When importing a 3D scene, if an existing import with the same name is
found, allow partially overwriting an existing import by selecting
the files to overwrite.

Task-number: QDS-3738
Change-Id: I8969da9bd03ef47ede4768cc2c7eb033bee3cb66
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-23 11:15:15 +00:00
Alessandro Portale
670616c6f9 Android: Use qAsConst with non-const Qt containers in range-loops
Change-Id: I1242a5c62a27b7b8f30bb7b43ff406eceb4135f7
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-02-23 10:51:37 +00:00
Leena Miettinen
beebf9389b Doc: Describe "Text codec for tools" Environment option
Task-number: QTCREATORBUG-25162
Change-Id: I5a5e18cec9f2a1f5479b997c705517b07b794458
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-02-23 09:41:24 +00:00
Mahmoud Badri
80dfaf3be3 QmlDesigner: Expand collapsed component categories when searching
- Expand collapsed categories in the following 2 cases:
  - When searching.
  - When choosing "Expand all" from the context menu.
- Update only changed data when expand state changes rather than
resetting the whole model.
- Update search after adding a new QML import and switching to
the components view.

Task-number: QDS-3781
Task-number: QDS-3784
Task-number: QDS-3789
Change-Id: I09e6f1f97171cd9172cadf4202dd8d02cbb78513
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-02-23 09:17:06 +00:00
David Schulz
01caf29221 LanguageClient: assign document to correct client
If a server is setup to start per project we want to open files of a
project in the matching server by default.

Change-Id: Ie266fd858420acd75b7a1fd45be7bee2b06460aa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-02-23 08:52:56 +00:00
David Schulz
9cc234fbdf LanguageClient: Add the project display name to the client name
If the client was opened for a specific project.

Change-Id: Iafc9f5d46d06e2e656702260f297d6b2b998a431
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-02-23 08:52:46 +00:00
David Schulz
65d977ed93 Android: generate .project and .classpath
These files are needed by the java language server to operate properly.

Change-Id: Ie96a1fe32fefeea7333c7fa752557f79796a1478
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-02-23 08:52:04 +00:00
David Schulz
605df0c4b6 Java: use a temporary directory for the workspace
Change-Id: Ie8fc01f680393f141f099f57b98eb16a10b37d7e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-02-23 08:48:49 +00:00
Leena Miettinen
1dafabdb87 Doc: Describe filtering search results for symbol usage
- Use the current name for the menu item in change log:
  Find References to Symbol Under Cursor
- Update screenshots

Task-number: QTCREATORBUG-25162
Change-Id: I3c46561c91c01f2d33039cb4431cd6b88d163e68
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-02-23 08:48:04 +00:00
David Schulz
3f773cb1e5 LanguageClient: avoid sending message to server shutting down
Send the workspace change method before the server gets shut down.
Prevents an assert in Client::sendContent.

Change-Id: Iaedc9829379d987aa6f91a87e26d35b64a9f0f55
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-02-23 08:45:52 +00:00
Leena Miettinen
870e495479 Doc: Describe "Generate Constructor" refactoring action
Fix entry in the change log to use the correct action name.
Also fix the entry above to use the action name.

Task-number: QTCREATORBUG-25162
Change-Id: Iebc2c6634c7bdc51ab97bb48ecce081e4000eccb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-02-23 08:44:01 +00:00
Eike Ziller
d8a35381cf Update 4.14.1 change log
Change-Id: I988aebbd52c4c6ce8b09c49ee3cd63dc63ec9513
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
v4.14.1
2021-02-23 08:27:22 +00:00
Ivan Komissarov
13f466c05d cmake build: Explicitly turn on project file updates on the QtC side
We want to have flags consistent with the Qbs build and project file
updates are disabled by default (for standalone qbs builds in Brew or
choco) to avoid dependency on QtGui

Task-number: QTCREATORBUG-25232
Change-Id: I217057f45519e0c92201d1b76d5b04924804aed0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-02-23 08:06:55 +00:00
Leena Miettinen
1ca2affa74 Doc: Add docs for Design mode toolbar icons and fields
Task-number: QDS-3771
Change-Id: I23ed3586090c47494831e156d04f8a40ebd586ca
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-23 08:04:34 +00:00
Leena Miettinen
e34bdf8c4d Doc: Rename and restructure Editing QML Files in Design Mode topic
Add a table that lists the views and links to their documentation
and to the documentation for the tasks that users can perform in
the views.

Change-Id: I96748b62163613aff1bb5f71782af007299b02ce
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-02-23 08:04:26 +00:00
Thomas Hartmann
c22ed5528d Add support for powershell Expand-Archive for archives
This will work with any Windows 10 installation.

Change-Id: Ia7ca25a5ba4e199ccfc37138e228c4d56f0f8a6a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-02-23 08:03:52 +00:00
Leena Miettinen
08e1893f0b Doc: Create a separate topic for Properties view
And place it under Design Views.

Restructure the Specifying Component Properties topic to start with
common component properties through setting colors to developer
properties.

Task-number: QDS-3771
Change-Id: I5cdfa12217fd61efac8eedad3efdd4486ef9593e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-02-22 17:18:10 +00:00
Leena Miettinen
04612e7736 Doc: Add a summary of Navigator icons and the actions they apply
Change the topic name to Navigator and move the topic under
Design views in the TOC.

Replace occurrences of "item" and "QML type" with "component".

Task-number: QDS-3771
Change-Id: I7dbe9803d88a409c8ba0a0ef074e2bc8a6866dec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-02-22 16:57:21 +00:00