Commit Graph

81484 Commits

Author SHA1 Message Date
Christian Kandeler
8241fc87b4 CppEditor: Fix semantic highlighting
... for the case where the first line with semantic tokens has multiple
tokens.
This was not considered in the algorithm and uncovered by
d6f5d07639.
Also improve variable names and comments.

Fixes: QTCREATORBUG-29218
Change-Id: I0a1927c21edd70a3a91efc902e7e6ad2c734c91f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-31 07:46:04 +00:00
Christian Kandeler
a6fd8d2f60 Update qbs submodule to HEAD of 2.0 branch
Change-Id: I962397da7fa19d4ba0948550a0cf35c9278637c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-31 07:44:45 +00:00
hjk
cc3e940f09 Vcpkg: Add a missing Tr::
Change-Id: Id3e7abdc7c9cfbe975dea9e099a0f088128152e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-31 07:43:08 +00:00
Christian Stenger
3c7644647b Copilot: Fix Qbs build
Change-Id: I0fea791042e78b52fc7c89024d9424f24bbe0a12
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-31 07:34:31 +00:00
hjk
96ffcb8d6c Terminal: Remove some redundante settings page setup
Amends 8b29c0637.

Change-Id: Idddcaaaf84cd87a07365d178cf98a8459608c41d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-31 07:27:15 +00:00
hjk
7f60d1c2e4 VCS: A few more simpler setLayouter calls
Change-Id: Ib361740d0e33742620048680720ddafba4cdce12
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-31 07:02:57 +00:00
Leena Miettinen
0b5123cd74 Copilot: Fix UI text
- Change an external link to point to the English language version
- Fix capitalization of product names
- Add a period to the end of a tooltip

Change-Id: Ia46709db9911c0a3bfad252db2ffe0b3f7e5f2d7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-31 07:00:44 +00:00
Eike Ziller
361eb17fbf FancyLineEdit: Fix placeholder text color
Amends 3dcdbe9069

Using the theme's PalettePlaceholderText only works for themes that
explicitly set it. Grab it from the application palette instead, which
is correct for all themes.

Observable by typing something into Locator and removing the typed text
again.

Change-Id: Iee7f900275ab7bcb37d87a2f7acddfee55fe9f79
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-31 06:14:05 +00:00
hjk
88fd4d7e7f Nim: Use Aspects more directly in NimbleTaskStep
Change-Id: I42fb8fd27b45260a62f9058c4c3e294909a72af4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-31 06:09:46 +00:00
hjk
7274e135f9 Some VCS: Use the simpler setLayouter overload for settings
Change-Id: Idb4b271f5723d1a4ea1809aa41b81fbeb900eb83
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-31 06:02:48 +00:00
David Schulz
a35fd42364 Copilot: position copilot tooltip above cursor rect
Change-Id: I37c6572000231334b90f38a2b37f5983c80174a5
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-31 05:31:47 +00:00
Orgad Shaneh
827b8ae376 TaskWindow: Do not jump to link on right-click
Change-Id: I7474fed01d971517ca490ab611e5089c759d9177
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-30 15:58:46 +00:00
Jarek Kobus
4e01ca18d1 TaskTree: Rename optional into finishAllAndDone
Rationale:
1. More descriptive.
2. More consistent with a planned new finishAllAndError policy.
3. Limits the possibilities of making a conflict with std::optional.

Change-Id: I5155630188e4b699e6c18b13a101e0e2d4fe98f2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-05-30 15:23:31 +00:00
Jarek Kobus
ffdb0c7dcc TaskTree: Some corrections to the copy example
Use QString instead of FilePath.
Rename the diffRecipe into copyRecipe.
Add some code that constructs the tree, connects to its done signal
and starts the tree.

Change-Id: I40e1c4784c736347682071b3e3e99db599ce102a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-30 15:23:20 +00:00
Jarek Kobus
cbca40401b TaskTree: Fix calling the proper group handler on stop
Add tests for it.

Change-Id: Ibb04b21c217196c9bbf6761851f4e1a300139a8c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-30 15:23:08 +00:00
Jarek Kobus
d69c3cec7d TaskTree tests: De-utils-ize TaskTree tests
Make the TaskTree tests dependent only on Tasking lib.

Introduce simple Timeout and Delay tasks for tests.
Using Timeout and Delay has a big advantage for these tests,
since e.g. when scheduling two parallel tasks with the same
timeout, we can expect the proper order in which they
finish. With AsyncTask it wasn't possible. Now, the tests
should be much more reliable and shouldn't exibit flakiness
anymore.

Use TickAndDone for Barrier tests.

Limit the tests' execution time from ~100ms into ~30ms.

Change-Id: Ifa08fd62c1a2759a877231c2220e353c1a26364f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-30 15:22:57 +00:00
Jarek Kobus
7625633ff2 TaskTree tests: Get rid of future synchronizer
The future synchronizer may abuse the subsequent test invocation
as it may still have spinning threads from the previous test run.

As all the started tasks should finish quickly on cancel,
we drop putting the canceled futures into the synchronizer.
Instead, we blocking wait for them to finish.

In this way, when the subsequent test is invoked, we should expect
the all available threads are ready to be used.

Change-Id: I9bb022b8c0950d27cb323ff83bf18148829160b3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-30 15:22:45 +00:00
David Schulz
ea108f4857 Editor: Adjust remaining usages of BaseTextEditor:convertPosition
amends 9bb126c0d6

Change-Id: I42b96f1f7364f75da88eccd7a86fc25b9cd1499d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-30 13:35:07 +00:00
Eike Ziller
efdb67bf90 ActionManager: Add special context that disables more specific contexts
This usually is not a good idea, but might be useful for the embedded
terminal widgets.

Change-Id: Ifeeb47a38596ee789a503f3c7030da5a464569c5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-30 12:46:30 +00:00
Christian Kandeler
e0a81731e6 TaskView: Fix scroll mode
Change-Id: I9bcb3315d545d4d32e67a6766c43324d9807ef1d
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-30 12:30:48 +00:00
Christian Kandeler
6a016ff014 Issues pane: Fix filtering
If the parent is visible, we always want to show the child as well.
The previous implementation would always assume the row number to be a
top-level entry, leading to seemingly random behavior if any sort of
filtering was active.
Amends 778d7a9819.

Change-Id: I354c1b07929c45034a7d24b4c31f986ddd01c877
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-30 12:29:28 +00:00
David Schulz
047814c6da Utils: fix likelyContainsLink for markdown
This allows us to also port the link in the resource tooltip to
markdown.

Change-Id: Iec0e19ff68db76290139e457694485222f0a38f3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-30 12:16:25 +00:00
hjk
aa63d5384f Meson: Merge toolsettingspagewidget file pair into toolssettingspage.cpp
An implementation detail.

Change-Id: I35bee5e0d27f7c6e6b8c69d1703ad21d86cc1694
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-30 12:08:13 +00:00
hjk
98b4973544 Beautifier: Use FilePath, not FilePathAspect for documentation file
That's not meant to be saved.

Change-Id: I04ab2ff1fb3abf7f01eeaa61f5bcf9792e4c637a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-30 12:08:04 +00:00
Jarek Kobus
61f0bf479d FileSearch: Reuse searchInContents() inside findInFiles()
Get rid of findInFilesRegExp().

Change-Id: Iae47b023a1428a66fff165c0a0a4fa38d55ba132
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-30 12:07:38 +00:00
Marcus Tillmanns
ba004e409f QMake: Fix build device root
Fixes: QTCREATORBUG-29140
Change-Id: I85a7ea54c9006079c1c270ded0a5bd9848db1408
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-05-30 11:27:05 +00:00
hjk
c2fcd17e91 Meson: Simplify settings setup a bit
Also some surrounding code.

Change-Id: I9f537a4357ab76295b7cb4f6a69749a0a6b55392
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-30 11:23:42 +00:00
Christian Stenger
78eb97fb54 Git: Fix default port for gerritoptionspage.cpp
We need to set the range before the value, otherwise we
end up using the default maximum of 99 when setting it.

Change-Id: I93de2cade3c2884dab64f04a52b2d3e3db98e1c4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2023-05-30 10:57:51 +00:00
Eike Ziller
3be931d234 Fix some unused 'this' lambda captures
Change-Id: I63cb4e68d8675c7a83d90c8ccc11e646b6a5c659
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-30 10:12:54 +00:00
David Schulz
38fde456a3 CppEditor: use markdown for resource image tooltips
Fixes: QTCREATORBUG-29217
Change-Id: Iba3d876d988336276996aac733a6ea9b0eb45882
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-30 10:12:17 +00:00
Cristian Adam
12456ce688 Terminal: Fix build with QTC_STATIC_BUILD
The `log` Q_LOGGING_CATEGORY was used in a different place, and would
conflict in a static build.

Change-Id: Id23722a2aca3ea9afb846d8dd75aed9972c7b16f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-30 09:43:58 +00:00
Cristian Adam
d64954b029 Utils: Fix QTC_STATIC_BUILD build
Change-Id: I14ac8c99708aba548d1054b37e5a445f6ac1a2b7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-30 09:43:44 +00:00
Eike Ziller
b9e316e8d1 Merge remote-tracking branch 'origin/11.0'
Change-Id: I057089d29f674e783011a22371f6499205bcf84b
2023-05-30 11:39:17 +02:00
Jarek Kobus
78f2dda7ef TaskTree: Add docs for execution mode
Transform it form TaskTree's description into description
of sequential and parallel global variables, and into
docs for parallelLimit() global function.

Change-Id: I4aa2bac2f47778cde039cee77052359264224f93
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-30 09:37:38 +00:00
Orgad Shaneh
8c3d2d122f TaskWindow: Remove unused m_contextMenu
Amends commit 432de3a198 (from 2012!).

Change-Id: Iadb9474e46d0d2758dc5a6d9219c2bf04c2d66c5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-30 09:15:10 +00:00
hjk
a6848e2026 Docker: Register settings aspect more directly
Change-Id: Iaf36d476f53eab459cba4d0e64e55b73a395beea
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-30 09:12:16 +00:00
The Qt Project
6bf550e759 Merge "Merge remote-tracking branch 'origin/10.0' into 11.0" into 11.0 2023-05-30 09:08:27 +00:00
Marcus Tillmanns
afbdad999d Core: Add Command::actionForContext
Change-Id: I04ea463e1e9f4addafbea78c6302a488d7992ccd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-30 08:55:21 +00:00
Marcus Tillmanns
5943a42249 Core: Add OutputPane::setupContext overload
Change-Id: I15dc1cfa1981ea32925988c524b54cfd5ea1fcbd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-30 08:55:16 +00:00
hjk
e47c49b3f6 Conan: Register settingsaspect directly
Change-Id: I16f6b55b66a15670fc6382073700321d1db56adc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-30 08:55:04 +00:00
Marcus Tillmanns
9719bcfd2e Core: Fix filter when selected is not registered
Without this patch a warning will be triggered on Windows and
the selected filter is not chosen on all platforms when saving
a file, e.g. a json file.

Change-Id: Id6de0eddcac83369596f68d50494f10b70c30b15
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-30 08:54:58 +00:00
Eike Ziller
e71d7bf454 Merge remote-tracking branch 'origin/10.0' into 11.0
Change-Id: I110bc26f4469093d262a77c27623ad1dddd1b7c1
2023-05-30 10:52:47 +02:00
hjk
aa2e8e3cb8 VcPkg: Adapt settings page setup to recent aspect development
Change-Id: I16f4721723450e2f843f2eff0946e29733978eb0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-30 08:51:44 +00:00
Eike Ziller
bc52355f98 Tr: Move some html out of texts
Change-Id: I46c8d81630e18e244f16cefe696d662632340008
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-05-30 08:51:04 +00:00
Christian Kandeler
0c1974f9b8 CppEditor: Fix highlighting angle brackets
The code assumed that all highlighting results come in at once, which is
no longer true as of d6f5d07639.

Change-Id: I5ed6baf88956d64a30ee3fb236d4e2575a7f80c9
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-30 08:34:08 +00:00
Christian Kandeler
2cce367906 qbs build: Do not mark Axivion as a commercial plugin
This gets rid of the (optional) LicenseChecker dependency and the extra
git hash embedding.

Change-Id: I8f148a83bcf563859fa01e5993999c2ab8fd7cc4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-30 08:32:26 +00:00
Christian Kandeler
5fe9c0fb7c MCU: Fix wrong includes
Change-Id: I87e701d11a25c1d6efb4924716034518c15e4053
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-30 08:30:28 +00:00
Jarek Kobus
05b922ca94 TaskTree: Add documentation for group handlers
Document onGroupSetup, onGroupDone and onGroupError methods,
TaskItem::Group{Start,End}Handler and TaskAction enum.

Change-Id: I7516b867a2e3ce33b8f15a18f85d1e61d673d65e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-30 08:24:53 +00:00
Jarek Kobus
bd48121a88 TextEditor: Reuse searchInContents()
Change-Id: I08403d05830232becf7e5329339aaecf288894b7
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-30 08:22:32 +00:00
hjk
6286ae9853 Utils: Use the path from the current object
... in Environment::searchInPath().

Amends 6ab66690.

Change-Id: I04984c6a84c4448a6cd6d4d2677c84ed54376fee
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-30 08:21:41 +00:00