Commit Graph

68765 Commits

Author SHA1 Message Date
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
Orgad Shaneh
1afa720f2c FilePath: Replace Q_OS_WINDOWS with Q_OS_WIN for consistency
Change-Id: Ia624c804e54fe4c5213351078a7aa9c8dec9f262
Reviewed-by: hjk <hjk@qt.io>
2023-06-01 11:45:50 +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
b2dadeb30c TaskTree: Fix the empty Group's return result
Get back to the originally intended behavior
for StopOnDone and ContinueOnDone workflow policies.
By default, these policies report an error until
at least one child task finished with success.
Since the group is empty, no child finished with success,
so the group should report an error.

Change also the return result for the StopOnFinished policy
when placed in an empty group. The policy is meant to
report the finished child's result. Since no task finished,
report an error in this case.

Fix tests accordingly.

Amends c9638ff642

Change-Id: Idc449e8c68a658755bf566df56844126167f1751
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:53:28 +00:00
Jarek Kobus
619735d99d TaskTree: Introduce withTimeout()
Make it available for Group or CustomTask items.

Note, that when withTimeout() is used, the total
number of tasks grows by one.

Change-Id: Idc71737ba66b92bdc4bf17599c793b1127d22f5e
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-01 10:53:21 +00:00
Jarek Kobus
1599106a22 TaskTree: Make the TimeoutTask reliable
Ensure the timeout tasks preserve the right order of
their done signals.

Change-Id: I62508d0710eb2324d7c347a9907a899c97d3975d
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-01 10:53:12 +00:00
Jarek Kobus
f6e7dbd416 TaskTree: Introduce Timeout task
By default, when finished, it returns success.
In order to convert it into failing task,
enclose it inside a Group with finishAllAndError.

Reuse it in tasking tests.

Task-number: QTCREATORBUG-28741
Change-Id: Ic81203203e0b139d4f9bfd553279ecb01cd303f4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-01 10:53:04 +00:00
Jarek Kobus
5e9eadfc58 TaskTree: Introduce finishAllAndError workflow policy
It's going to be used in timeout task.

Change-Id: I2abd65b461cab445ada7a0ad5e1bbe07d1b6323b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-01 10:52:57 +00:00
Sivert Krøvel
65a7d3a200 McuSupport: Update test data
Change-Id: I56a82274bd34ac9a34a785c43cc066ca6598fbaa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
2023-06-01 10:04:39 +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
hjk
9574122da1 ProjectExplorer: Aspectify Compile output settings page
Change-Id: Icc7b1917a57a96e482db7b4f0ba5c0a203f4958c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-01 09:05:42 +00:00
hjk
3ca94f9c90 Debugger: Use simpler setLayouter function
Change-Id: Ib213100fc9dd37b23d323a99007e6ed73378f347
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-01 09:03:51 +00:00
Marco Bubke
4e91fd627a Don't add braces around single line scopes
There is a new option which adds braces:
https://clang.llvm.org/docs/ClangFormatStyleOptions.html#insertbraces

Change-Id: I1b0da930fa9faadb215fff4ed653bc95da0a6a17
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-01 09:03:18 +00:00
Eike Ziller
10bf294975 Use KiB/MiB/GiB/TiB for 1024-based units
That is also consistent with our file properties panel

Change-Id: Ief62f8c067896a410878cfa4c36f17c6daf6fee7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-06-01 08:49:46 +00:00
Eike Ziller
5365c5de80 Tr/QML Code Style: Just use "Other" for group box title
"Qml JS Code Style" is wrong (consistent would probably be "QML/JS Code
Style"), and since this is already with "Qt Quick > Code Style" with
another group box titled "Tabs and Indentation", it is also weird (the
other group box is also about the QML/JS code style).

Change-Id: I61d5f273b91aebf95f0e5f5913e160195dcd7a11
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-06-01 08:34:20 +00:00
hjk
9375979698 Utils: Make PathChooser remote support configurable in aspects
... and switch is _on_ by default.

Change-Id: I82e66da477dae1ee955b81babc6230b67e530d45
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-01 08:31:46 +00:00
hjk
f72a5d1832 ProjectExplorer: Rename projectexplorersettingspage.cpp
... to projectexplorersettings.cpp and merge
projectexplorersettingspage.h into projectexplorersettings.h.

A preliminary step on the path to aspectification.

Change-Id: Id482c0e8e03a2d37b07b9c1d810825afcede91b6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-01 08:29:36 +00:00
Marco Bubke
40954b8767 QmlDesigner: Handle invalid nodes and properties better
rMdel::removeModelNodes and Model::removeProperties should filter
invalid nodes.

Change-Id: I270f6712cbcc0cd672c9551cccd1de5e740eb549
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-01 08:07:35 +00:00
hjk
8636b35e87 RemoteLinux: Explicitly allow remote paths for device's gdbserver
... and qml runtime. Useful on Mac and Windows where there'd be
a native but local chooser dialog otherwise.

Change-Id: I6361c6f6067c86dd7cca15ce1dd02150136cf3f7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-01 07:55:13 +00:00
Jarek Kobus
3c08ebbe26 TaskTree: Make enums known to the Qt meta object system
Change-Id: I72d8b74460febe1d7ad7d840e25cea02cd77b308
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-01 07:43:31 +00:00
Jarek Kobus
b51188c9a9 TerminalPane: Fix a warning about an unused arg
Change-Id: I63d19a608c63532e0e83df929da6cb07dc896722
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-01 07:40:17 +00:00
Eike Ziller
0b863af8a1 Tr/Python: Fix translation issues
- Use parametrization
- Split message that relied on sentence structure of the language

Change-Id: I5c0cca684bc9c94219e740fe0292e358a91714da
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-01 06:26:06 +00:00
Eike Ziller
deb974de05 Tr/LanguageClient: Add some comments, parametrize error message
Change-Id: Ifd7354c10d18c0df093908c1a240f254c679893a
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-06-01 06:25:52 +00:00
Christian Stenger
f8a28abd78 Terminal: Fix qbs build
Change-Id: I7ce36f99927fe3d4a2d344819d8082fdae8cfce4
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-01 04:47:17 +00:00
Thomas Hartmann
18d2a221f2 QmlDesigner: Bypass resource management in rewriter
The user does not expect the resource management to be triggered
by the rewriter, therefore we skip it.

Change-Id: I26932d268b9c27829dd2f1d2c80def8e7578899d
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-05-31 20:06:02 +00:00
Thomas Hartmann
4fa73127a5 QmlDesigner: Simplify and speedup property parsing
By using PropertyMetaInfo we increase performance and simplify
the property parsing.

Change-Id: Ibe979543e8c59c13bd2c1320f7ebd31b3417da3f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-31 20:05:44 +00:00
Marco Bubke
8a69afc1bd QmlDesigner: Fix model resource management bypass
Fixes: QDS-9766
Change-Id: I7a242b8e922140f7e100e90af1cd5029e82fcb5c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-05-31 14:48:57 +00:00
Christian Kandeler
7a37a9c76c ProjectExplorer: Consider the case of no active target
... in BuildManager.

Fixes: QTCREATORBUG-29207
Change-Id: Icbcdc957cd9105f7c4b9bc27fc9feb34dd547955
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-05-31 14:08:57 +00:00
Marco Bubke
397a95689f QmlDesigner: Add removing of multiple nodes and properties
Sometimes multiple nodes or properties has to be removed. In that case
there is also the possibilty that we want to bypass the model resource
management.

Task-number: QDS-9766
Change-Id: I6c3cb0f682a7579f23d72431f641e2f812e2c63c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-05-31 14:02:16 +00:00
hjk
8b848df858 WebAssembly: Use the more compact layouter function
... and delay the first update until all ui elements are present.

Change-Id: Ica996c3262caed9397a951633b0971d48c7c683f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-31 13:39:37 +00:00
David Schulz
95b4da9ba9 TextEditor: add tests for the code assistant
Task-number: QTCREATORBUG-28989
Change-Id: Id76d5df589ab50c7deb96b8ad29d1f29bc368e59
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-31 13:38:13 +00:00
Jarek Kobus
29811f81dc FileSearch: Introduce FileContainer
That's going to replace FileIterator.

Benefits over FileIterator:

1. The FileContainer is a value type which may be
   freely copied.
2. Much faster iterating, especially for SubDirFileContainer
   with a big number of dirs / files (over 500000).

The FileContainer has begin() and end() functions returning
FileContainerIterator. The FileContainerIterator, when it's
not an end() iterator, contains the Item's value itself.
Whenever the iterator advances, the Item's value changes,
while the reference to Item's value remains unchanged inside
the iterator.

The SubDirFileContainer doesn't keep the references to all
visited Items anymore, contrary to the corresponding
SubDirFileInterator. The values of the individually visited
Items are kept only inside FileContainerIterator instances.

The progress information is available through the
FileContainerIterator's progressValue() / progressMaximum().

Task-number: QTCREATORBUG-28892
Change-Id: If89ac1121c21fa2fb7355aa12438dce3e85e465d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-31 13:33:09 +00:00
Alessandro Portale
476651e5a3 McuSupport: inline mcukitcreationdialog.ui
Change-Id: I1c88663248dceb318f9acbabe585fbd24e794ab6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-31 13:18:21 +00:00
Marcus Tillmanns
9f1a2c4f8f Terminal: Rework commands
This rework fixes the way commands are registered in Qt Creator.

Change-Id: I401f3ac7d9194dad8fceb507360ddc3633106eb4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-31 13:17:49 +00:00
Marcus Tillmanns
44e9d56c04 Utils: Fix macOS permissions parsing
Change-Id: I5fdde04c197b5db323fc8630c4ee4b2c197d947a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-31 13:15:07 +00:00