Commit Graph

68765 Commits

Author SHA1 Message Date
Christian Stenger
1bc3cccbb4 Copilot: Do not try to start copilot without nodejs
Avoids the attempt to start the client if nodejs cannot be
found.

Change-Id: I3783280120ca754291a92b3308c1192906facd08
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-31 12:53:35 +00:00
Marco Bubke
2b000d079b QmlDesigner: Ensure that for an empty expression an invalid value is returned
Change-Id: If0d526b645972ed283d4d0117dfb7b1f466c3842
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-05-31 12:29:09 +00:00
Robert Löhning
58fb6f88a6 SquishTests: Update reading build issues
Fixes tst_build_new_project, tst_CCOM02 et al.

tst_tasks_handling fails which might be an actual issue, reported in:

Task-number: QTCREATORBUG-29209
Change-Id: I5eae54df27d8ba8f441e5b9c4acdaa2b41716245
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-31 12:04:15 +00:00
Eike Ziller
7bd06829c4 Tr/VCS: Fix various issues with translations
Inserting the name for the "commit" operation into messages relies on a
certain sentence structure and doesn't work with translations. Same for
"optional" error messages. Use different complete messages for the
different cases instead.

Avoid explicit line endings, use automatic word wrap instead.

Add some quotes and full stops.

Fix message with plural.

Don't use %n for constant number (inline in message with assert).

Improve confusing tool tip for instant blame.

Change-Id: Ic8453763279753ebd5898858951acddcf311e6e4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2023-05-31 10:53:24 +00:00
hjk
ff2ed7d94b CppCheck: Move to simpler setLayouter calls
Change-Id: Id0e9f1adfe730f6067ade9472db597e3a12fc2e3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-31 10:25:36 +00:00
Ali Kianian
1dafc64a54 QmlDesigner: Flush the output stream after sending commands
The output stream should be flushed in order to forward containing data
and clear the stream buffer.

Task-number: QDS-9871
Change-Id: Iec9903a8afb98f3b9d03a9b9c4de67b6bfe3d35b
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-05-31 10:21:27 +00:00
Jarek Kobus
43d5944873 CoPilot: Fix a warning about an unused arg
Change-Id: I8b4e552aac0931fea2af4ecc5e70a25c39871fab
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-31 10:02:17 +00:00
Jarek Kobus
1a9025cdd5 TaskTree: Add docs for Workflow Policy
Transform it form TaskTree's description into WorkflowPolicy enum
docs. Document global workflow policy elements and global
workflowPolicy() function.

Change-Id: I4af3f7ffa703bbb1a9370e2fd1f9242a68131295
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-31 09:59:23 +00:00
Burak Hancerli
fbc4848f96 QmlProject: Support QDS. prefix when reading
This patch also includes a small update to skip creating 'shaderTool'
object in the json container if it doesn't exist in the qmlproject
file.

Task-number: QDS-9969
Change-Id: I1b8639c5e0a57aa77cbd417b51d57c1f4910613a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-05-31 09:44:23 +00:00
hjk
9051e6ccae Squish: Use PagedSettings for main settings
Change-Id: I6314b746284e8fd032d32170bf353da544c7793f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-31 08:55:08 +00:00
Jarek Kobus
e38b2cab44 DeviceShell: Refrain from using potentially invalidated iterators
The stored container iterator, after container is modified,
may be already invalidated. Avoid storing the iterators and
do the search again after potential container modification.

Use QHash instead of QMap for faster insertions / lookups.

Amends 0135c47849

Change-Id: I0a4641d3b410836a5b3b9be252059e4e37fa94e3
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-31 08:44:22 +00:00
Marco Bubke
504d24db30 QmlDesigner: Model resource management
The model is now deleting and changing the dependencies by itself. That
has the advantage of consistency. So if a node is now removed all the
dependecies will be deleted changing in the same way.

Task-number: QDS-9766
Change-Id: I1edf9ce172e51b9f52b62612ed2bb7386bf5b221
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-31 08:05:59 +00:00
hjk
676d06d768 Use simpler IOptionPage::setLayouter overload in a few more places
Change-Id: Id3745dab4363279219062462492b3a3e789776be
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-31 07:50:03 +00:00
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
Thomas Hartmann
bf7f07605b QmlDesigner: Fix regression when resetting '.' properties
For '.' properties we have to replace '.' with '_'. In any
case we have to set the instance value after the property
was removed back to the default value.

Task-number: QDS-9934
Change-Id: I0e52e40ccfdf976d53be90030c010cf131e9eca8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-05-31 07:25:58 +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
Marco Bubke
b466af176f Sqlite: Make statement moveable
It is save to move a sqlite statement.

Change-Id: I094e4221ed1d14f01bf202cff6840518efb52cb0
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-05-30 14:02:54 +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
Marco Bubke
84a0e154b8 QmlDesigner: Devirtualize QmlObjectNode
The Qml*Node were never designed as a virtual interface but as handles.

Change-Id: I238476d7e8f40e9fdd672917aee7f06d832ddfd3
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-05-30 12:36:45 +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
Marco Bubke
8330d4463a Sqlite: Fix that prepare is not checking that the database is locked
The database has to be locked because otherwise it is not thread save.
Because Sqlite connections are already called in different threads this
has to be enforced. The easiest way to lock a database is to put it in a
transaction.

It should be ok without locking so long the connection is only called
from one thread but I prefer to enforce it because I have already seen
code was preparing a statement not on initialization stage where it is
highly unlikely that there is more than one thread pre connection but in
the middle of the code. Because preparing is much more expensive than a
lock I prefer to enfore a lock here.

Change-Id: Id0b47f8d615a6697bb807392cafbe976bdd37233
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-30 11:20:00 +00:00
Marco Bubke
9773e523ce QmlDesigner: Fix flacky StorageCache tests
A id with value zero is now invalid. So we offset the id value by minus
one. We had to check if the id is valid before adding it too.

Change-Id: I433772da0358ec48970313d89ea0b56e21f635e4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-30 11:11:18 +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
Marco Bubke
2981feefd7 Sqlite: Improve readCallback
There are many callback which do not control the flow and want to be
called for all steps. For that case we assume that a callback without a
return value will continue always.

Change-Id: I706123f2c425ac8c937d4d60ab977dae5ea9b030
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2023-05-30 09:59:19 +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