Commit Graph

56077 Commits

Author SHA1 Message Date
Tim Jenssen
002d84cb15 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts: src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
  src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
  tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
  tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp

Change-Id: I257f1908917bcc58805619b53b6866f2f73ca544
2023-06-02 19:26:05 +00:00
Brook Cronin
bc64870688 QmlDesigner: Add new icons for content updates
Change-Id: Id5f1694eb301157cad3e67bd576df184527dd6a1
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-02 16:41:31 +00:00
Thomas Hartmann
c716056cbc QmlDesigner: Allow transitions also for bindings
Task-number: QDS-10019
Change-Id: Ib7003047241fde3838b248d1fc90161725cb94f9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-02 15:10:20 +00:00
Thomas Hartmann
602e08dbee QmlDesigner: Fix issue with duration tracking
An event can start and end duration tracking at the same time.

Task-number: QDS-9961
Change-Id: I97265f753887e87ef5bdb9b4bc93ca97922a51d4
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-02 14:50:12 +00:00
Aleksei German
3c36e77858 QmlDesigner: Fix some escape characters
Task-number: QDS-9415
Change-Id: I6459451d0f7699c727b2e0baad726f5c6af2ca74
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-02 13:32:03 +00:00
Alessandro Portale
e759ce310f Core: Use LayoutBuilder in PluginDialog
Change-Id: I06b07234727fc46a717af89febae43af1cb67b9b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-02 12:46:40 +00:00
Miikka Heikkinen
d9cc2dc8c5 ProjectExplorer: Fix check for "Kits" page hiding
Fixes: QDS-9231
Change-Id: I53fc333fca2ec81edcb2b254a98613309e8335a9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-02 12:41:26 +00:00
hjk
c8e1333f89 ProjectExplorer: Remove 4.11 compatibility code in buildsteplist
Change-Id: Id0e65f17dcd4697e3c4d1f828a564b495e114ee4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-02 11:58:42 +00:00
hjk
5986270232 QMakeProjectManager: Remove compatibility reading
For versions less then 4.12 (2019).

Change-Id: I566189eafe6deb1ed29b2e004a38cdd4295ea9b0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-02 11:58:24 +00:00
Jarek Kobus
f10581ee31 GitGrep: Reuse searchInProcessOutput()
Change-Id: I5e97f23c0e2a06ccd3d204977ac1abc986b84e5c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-02 11:51:29 +00:00
Jarek Kobus
64d209c24b SilverSearcher: Reuse searchInProcessOutput()
Change-Id: Ifc28a88c7bd0de94ea78c5f3eaaa2179b0aee600
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-02 11:51:08 +00:00
Jarek Kobus
8da3575d72 BaseFileFind: Introduce searchInProcessOutput()
To be used by SilverSearcher and GitGrep.

Change-Id: I16a5fa18a90e6c895658ebc9dd8fd209235e17d3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-02 11:50:29 +00:00
Jarek Kobus
7b2c1fdab0 GitGrep: Make pause and continue working
Make cancel and continue button working. Make pausing
above 200000 hits working.

Applied the same pattern as it was done recently inside
SilverSearcher: cd70d10dce.

Change-Id: I5e466e2176a59301dbfd3f957012e1760bd0c20f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-02 11:50:22 +00:00
Jarek Kobus
7a42c32732 SilverSearcher: Fix quitting the loop after resume
Quit the loop after resuming when the process already finished.

Amends cd70d10dce

Change-Id: I73d4b11bb2be47ce9cc6c6c816b60058bc2db250
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-02 11:50:11 +00:00
Aleksei German
a13de9a5fd QmlDesigner: Fix a typo in deescape function
Change-Id: I2f474fdaaee8b556a5a91b61bf3025d9f6d480fb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-02 11:28:23 +00:00
Miikka Heikkinen
85739119af QmlDesigner: Don't allow add QtQuick3D import for MCU project
Don't show the normal onboarding label on 3D view if current project
is a MCU project that doesn't support QtQuick3D.

Fixes: QDS-10012
Change-Id: Iaa309efac3a5b2c0f2fce2e5e96c9012eaf6750d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-02 11:27:27 +00:00
Eike Ziller
04c2a32fc0 ExamplesParser: Export only for tests
Makes binary compatible changes easier later, if needed

Change-Id: Ib3e04ac3a26068cf9f8bcc57b2dad9d0aeaaa5c3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-02 11:22:41 +00:00
Christian Stenger
d9e3d32a80 MarkdownEditor: Ensure focus is inside the editor part
When loading a file it is more likely that the editable view
of the document should be focused than the read only part.

Change-Id: I8b7ed40a233dedf94883072be7462ebeabb78b42
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-02 10:42:02 +00:00
David Schulz
68a5cd6575 LanguageClient: postpone creating progressbars
Some language servers are spawning progress reports for many small
tasks. This can get distracting in the case where those progress bars
are spawned while typing, like in the case of the python language server
that creates a report for every lint that gets triggered after receiving
a document change notification. So in order to reduce the amount of
progress bars created from progress reports we postpone the creation of
the bars.

Fixes: QTCREATORBUG-29224
Change-Id: I2e658be0a26b21e41c80b444184648ba70682522
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-02 09:03:02 +00:00
Yasser Grimes
f146bebbc7 McuSupport: Simplify template integration
To simplify how users integrate their projects with Qul, Qul related
template files are placed under the "qmlproject" subfolder.

Task-number: QTCREATORBUG-29114
Change-Id: I984f1619547951e0518790c843987f03b7daa62a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-02 08:32:22 +00:00
Miikka Heikkinen
8654afc4d6 QmlDesigner: Force manual lights baking mode if unexpected properties
If unexpected property values are encountered during lights baking
setup dialog population, e.g. binding property is used for a property
when variant property is expected, we automatically set the manual
baking mode.

Fixes: QDS-10009
Change-Id: Iee25ed5ae9699f4efb70d2b8b57dea451cab5dce
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-02 07:33:59 +00:00
David Schulz
270972c7bb ClangCodeModel: report highlight results in one batch again
... with Qt 6.6

Change-Id: Ic3ebb5cee4deeebf87a0d8e0ab33bcdc1c92c3a2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-02 05:37:50 +00:00
Henning Gruendl
65600c8805 QmlDesigner: Fix EditableListView
- Fix ComboBox value not cleared after last material removed
- Add ListValidator
- Use ListValidator for the EditableListView in order to properly check
  for acceptable input in regards to textRole and valueRole

Task-number: QDS-9645
Task-number: QDS-9891
Task-number: QDS-9896
Change-Id: Ia3ebad1f8080a4a4ef6bd0da6a72e335d1e76643
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-01 22:20:02 +00:00
Thomas Hartmann
621df696d4 QmlDesigner: Add support to trace two following events
By calling registerCombinedTracedPoints we collect the duration
between EVENT_STATE_ADDED and EVENT_STATE_CLONED.
If EVENT_STATE_CLONED. follows after EVENT_STATE_ADDED in less than
10 seconds we emit EVENT_STATE_ADDED_AND_CLONED togehter with
the actual duration between the events.

Task-number: QDS-9961
Change-Id: If23b7dfa4e34bd533492b78f066dcb7518c2563e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-01 18:42:50 +00:00
Jarek Kobus
738d13cd43 GitGrep: Use QStringView for parsing
This speeds up the parsing of big results (~2 million hits)
by ~5-10%.

Remove PromiseType alias.

Make regexp a member field and configure it just once inside c'tor.

Change-Id: Ib99597a7b8b979d49f36f2c7d146beeaa1caa380
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-01 17:00:16 +00:00
Thomas Hartmann
547f719631 QmlProject: Add trace point to qmlproject
We use the qmldesignerplugin, if the qmldesigner plugin
is disabled then nothing is traced.

Task-number: QDS-10010
Change-Id: Ifa7f7719efca6a757e69b75937368d7a69a5e460
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-01 16:46:58 +00:00
Thomas Hartmann
a687af8324 QmlDesigner: Unify and fix property comparison
So far string and QString were not considered equal.
Unifying the type comparison.

Task-number: QDS-9938
Change-Id: Ia64fee9b56b8cf916669aca1d3f09a3f05ecf29f
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-06-01 16:44:50 +00:00
Jarek Kobus
71d492ae13 GitGrep: Use the text editor font for the results
This looks more consistent with the results reported by the internal engine.

Change-Id: I7a83954d230a61bb6db380d28de32ebde95ad366
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-01 16:36:07 +00:00
hjk
03485af139 Autotools: Self-register aspect in AutogenStep
Change-Id: I130ec25e6bf0bb6a45de7325834b8cc19f8c86e7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-01 16:19:11 +00:00
hjk
db4dd91caf FakeVim: Streamline settings handling a bit
Change-Id: I6ab2c1643a5236525515ded296cd854933584603
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-01 15:33:59 +00:00
hjk
629e6ab945 Use a few more explicit FilePathAspects
Change-Id: I97431306754af3ea7a803021db7b876c31abc940
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-01 15:33:47 +00:00
Jarek Kobus
cd70d10dce SilverSearcher: Don't crash on giant output from ag
Make cancel and continue button working. Make pausing
above 200000 hits working.

Fixes: QTCREATORBUG-29130
Change-Id: I55429ae1b4d80dacfcd7e8366133657d0c44a0d6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-01 14:46:20 +00:00
Aleksei German
94b5b09586 QmlDesigner: Fix unused warning
Change-Id: Ie849bd37ba1d1c502a20885f11cf5ddd35a268e4
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-01 14:34:54 +00:00
Marco Bubke
1655f1f622 QmlDesigner: Remove FlowTransition if to or from targets are removed
Task-number: QDS-9766
Change-Id: I41c5d6769400772aa4b0d8b395b6a7ed79270cbd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-01 13:53:53 +00:00
Christian Kandeler
333cea6ef5 CppEditor: Handle semantic highlighting results in chunks
Otherwise, we will format all tokens n+1 times, where n is the number of
tokens following on the same line. This is because results trickle in one
by one from clangd as of d6f5d07639.

Change-Id: I38aa2c4a26336f76219d182113bb838e1866fb8e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-01 13:18:51 +00:00
Marco Bubke
23c2668657 QmlDesigner: Update clang-format
Change-Id: I1793898e27a92aaf3f4f88390537c405d1f27427
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-01 12:20:14 +00:00
Jarek Kobus
d81d1bc14c SilverSearcher: Make the search cancellable
Especially when there are lot of files, and not too much results.

Change-Id: Id9e89c5d0d681e11dd8a9fb5c2373164dbeef3fd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-01 11:49:07 +00:00
hjk
f4eff5f76d Core: Remove IOptionPage::setLayouter overload
The one producing LayoutItems it sufficient nowadays.

Task-number: QTCREATORBUG-29167
Change-Id: Iba50a0cf4f16a95dbe68ca01c42bda4ac5441f75
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-01 11:42:21 +00:00
hjk
64c48af15b ProjectManager: Auto-register build settings aspects
Add the necessary contructor to TriStateAspect, too.

Change-Id: Ieb0f19cdf95f7492380d7c4e5663f455e4da3452
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-01 11:36:43 +00:00
hjk
5fb623fc14 Macros: Merge macrooptionswidget.{h,cpp} into macrooptionspage.cpp
Change-Id: I4493d781a503dde252ae6ad4d705e378b5b0ed51
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-01 11:36:21 +00:00
hjk
00f427f68e QmakeProjectManager: Auto-register aspects
Change-Id: I61b41b0155e125173e48686d1482bb8bd94055da
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-01 11:36:10 +00:00
hjk
7d40a35d9e Android: Use aspect as direct member in deploy step
Change-Id: I7c7037ca5ca1fb1cd3fcb7ab66a30a6f62986e20
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-01 11:36:00 +00:00
Jarek Kobus
3ee32c1a3b TaskTree: Reuse withTimeout()
Add static runBlocking() overloads.
Replace int timeout arg with std::chrono::milliseconds.

Change-Id: Id10a010f05eda8452cd7e4cd9ee46216087fc70e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-01 10:54:10 +00:00
Jarek Kobus
86d4c72421 SilverSearcher: Rename some files
Make naming more consistent.

Change-Id: Ic6ca72e5d048e5e452df6ead2b7da8f3c1cd0282
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-01 09:42:56 +00:00
Jarek Kobus
5e8795b353 SilverSearcher: Rename output into input
The passed text is an output from the ag command,
but, as seen from the parser point of view, that's
the input data for the parser.

Change-Id: Ic5d42406fd5ff1f52969fde3c2d44aaa34b9133b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-01 09:42:30 +00:00
Jarek Kobus
a3bb39d3c3 SilverSearcher: Do some cleanup
Remove unneeded includes.
Code style corrections.
Make global functions in cpp static.
Fix const correctness.
Fix nameFiltersAsRegExp variable name.
Remove unneeded d'tor.

Change-Id: Ia8aef3701bc8853905a3661242b33351ce319004
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-01 09:41:53 +00:00
hjk
5c5624007b FakeVim: Use PagedSettings for main settings
Change-Id: I5029ae42ca5c3ec426d37a818150677186dd55ea
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-01 09:41:34 +00:00
Jarek Kobus
2fcaba567b SilverSearcher: Use the text editor font for the results
This looks more consistent with the results reported by the internal engine.

Change-Id: I1f5a405bcfd7b32c01ef6d4db0324985e657f6a3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-01 09:41:10 +00:00
Jarek Kobus
1e09ac087a SilverSearcher: Limit the number of calls to nextLine()
It's a preparation step for the incremental parsing.

Change-Id: I98268abd6d3e0210f218663a6c2bb701c3bfc070
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-01 09:40:58 +00:00
Tim Jenssen
a17fe325c0 RemoteLinux: set a default QmlRunCommand
If there is no device qmlRunCommand even though it is a remote device
QmlProjectRunConfiguration uses a desktop path and on windows
that results in wrong file separators ->
"\usr\bin\appcontroller ..."

Task-number: QDS-9994
Change-Id: I054addf86922b50bc2e2f620d536953b72ee3331
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-01 09:09:52 +00:00