Commit Graph

8097 Commits

Author SHA1 Message Date
Jarek Kobus
ef71c022de TaskTree: Introduce conditional API
Change-Id: I002ea7636d12719cb1e27a4666e3869ea2254114
Reviewed-by: hjk <hjk@qt.io>
2024-07-03 14:02:34 +00:00
Jarek Kobus
0b19c83bed TaskTree: Make it possible to return bool from done handlers
Alternatively to returning DoneResult, for convenience.

Change-Id: Id845190a2a0587048ddb3a6c33019feca8cd0de7
Reviewed-by: hjk <hjk@qt.io>
2024-07-03 14:00:08 +00:00
Christian Stenger
4969fe9921 SquishTests: Add new extensions view as expected
Fixes e.g. accessing the Help view.

Change-Id: If8051ba93d20704670c3bcab60d4d5bcd5d539bc
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2024-07-03 10:14:03 +00:00
Jarek Kobus
da218493c7 TaskTree: Introduce a bit more logic (AND and OR against DoneResult)
Introduce AND and OR operators for ExecutableItem
taking DoneResult.

The "task || DoneResult::Success" is an eqivalent to
tweaking the task's done result into success unconditionally.
The "task && DoneResult::Error" is an eqivalent to
tweaking the task's done result into error unconditionally.

Change-Id: Ib9213a786697c1434c37e99e726641baab550523
Reviewed-by: hjk <hjk@qt.io>
2024-07-03 06:53:46 +00:00
Christian Stenger
79de38d8cb GoCmdBridge: Add to qbs build
Change-Id: Iac64b8e813f90f727c7469073ea491628ab3014d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-07-03 04:09:37 +00:00
Jarek Kobus
490410e18d TaskTree: Introduce a bit of logic (AND and OR)
Introduce operator&& and operator|| taking ExecutableItem
as a second arg.

Both tasks (first and second) execute in sequence.

AND:
- If the 1st task finishes with Error, the 2nd task is skipped
  and the returned item reports Error.
- Otherwise, the 2nd task is executed
  and the returned item reports the 2nd task's result.

OR:
- If the 1st task finishes with Success, the 2nd task is skipped
  and the returned item reports Success.
- Otherwise, the 2nd task is executed
  and the returned item reports the 2nd task's result.

Change-Id: Ib7874a82bd86eeb57fa5d3691b4a9e63a158772f
Reviewed-by: hjk <hjk@qt.io>
2024-07-02 14:50:27 +00:00
Jarek Kobus
0f5882f13c TaskTree: Introduce a bit of logic (NOT)
Introduce ExecutableItem operator!(const ExecutableItem &item).

This operator returns a copy of this executable item
with DoneResult tweaked by negation.

If this item reports DoneResult::Success, the returned item reports
DoneResult::Error.
If this item reports DoneResult::Error, the returned item reports
DoneResult::Success.

Change-Id: Ie609938e92bbc38ddcc66f5bc3244f864e3e59c7
Reviewed-by: hjk <hjk@qt.io>
2024-07-02 14:50:18 +00:00
Eike Ziller
0283b81392 Merge remote-tracking branch 'origin/14.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: If39fe80197537c489361810e91ee221c6c52ea01
2024-07-01 12:01:27 +02:00
Marcus Tillmanns
691c4adeec GoCmdBridge: Add golang based command bridge
Change-Id: I3b791febafc09f897afbf6d9da999deeca6f5115
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2024-06-28 09:44:23 +00:00
hjk
878d4c74b7 LayoutBuilder: Add object guard in slot
Change-Id: I1912c206f5056cb19a8a7b73cfbe4dfd45978a2a
Reviewed-by: hjk <hjk@qt.io>
2024-06-28 07:35:15 +00:00
hjk
68adb2c086 Debugger: Enable another dumper test for LLDB
Passes nowadays.

Change-Id: I616f989c23b16a1a89d24461480dd676ce62bccd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-06-28 07:12:16 +00:00
Eike Ziller
8dccc9c59e Merge remote-tracking branch 'origin/14.0'
Conflicts:
	src/plugins/qmljseditor/qmljseditorsettings.cpp

Change-Id: I443424afdfe48cdfc3d083d8e91335e937fcfdb6
2024-06-27 11:41:54 +02:00
hjk
c1b8320ca2 Debugger: Execute all inheritance tests also for LLDB
LLDB 3.8/360.x was not working with multiple inheritance even on
the command line, but looks ok nowadays at least in this simple case.

This does not fix the linked task.

Task-number: QTCREATORBUG-31042
Change-Id: Ibc52c9aaf31513af05487657a229fc4945d7e08f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-06-26 06:55:27 +00:00
Jarek Kobus
bcba7184f0 TaskTree: Implement AssetDownloader example
This is an equivalent of the downloader used for
the car-configurator example.

Change-Id: Ia0ab13ea7d4557d375b44aa2ba06be5a81651251
Reviewed-by: hjk <hjk@qt.io>
2024-06-24 15:03:14 +00:00
Ali Kianian
7caf81117d QmlDesigner: Unify invalid ids
Fixes: QDS-13056
Change-Id: I8d99e0e9eba148fe4d31c3c9a2d28f46d91b377a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2024-06-24 14:43:47 +00:00
Marco Bubke
dad1232165 UnitTests: Fix typo
Change-Id: I5f5e3f208603733b173798816f2e9ada9ff39140
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-06-20 13:46:47 +00:00
Marco Bubke
b98a67ee9e QmlDesigner: Fix tests for changing import in model
Change-Id: Ie09f4d77da460362deb068d2358dfb311d6428be
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-06-20 13:28:32 +00:00
Eike Ziller
afde8fd1a7 Merge remote-tracking branch 'origin/14.0'
Change-Id: I5e5ffe1b986fd8b4e5d60c9a5864541747ef890c
2024-06-19 11:30:02 +02:00
Jarek Kobus
15e510abcf TaskTree: Make use of the trivial DoneResult handlers
Change-Id: I71915fc50f073cc90b0fb2562bb82e9c4a73ccd1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-06-19 08:32:37 +00:00
Jarek Kobus
33eb5f509c TaskTree: Make it possible to pass DoneResult as a done handler
This patch addresses the 38th point in the bugreport below.

Add tests for it.

Adapt docs and warning messages accordingly.

Task-number: QTCREATORBUG-28741
Change-Id: I276d2d4c3a514147f67252dc5073d79fed94b9ff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-06-19 08:32:27 +00:00
Jarek Kobus
34044757ef TaskTree: Fix tweaking done result in group done handler
If the onGroupDone() handler returned DoneResult,
this result was ignored by the running task tree.

Fix it so that the optional DoneResult takes
priority over group's workflow policy.

Add tests for it.

Change-Id: I7ffdef2af08337d7214f2c3d4b68153cddaad425
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-06-19 07:41:38 +00:00
Robert Löhning
70538bf38c SquishTests: Handle and report missed breakpoint instead of crashing
Change-Id: I28756803149828da871d48303ac0c989a2e99f7e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-06-17 14:46:31 +00:00
Eike Ziller
8bbc72a017 Merge remote-tracking branch 'origin/14.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: I325f21db9bac247a02cb14452f190b378147f581
2024-06-17 13:54:25 +02:00
Knud Dollereder
24c79573db QmlDesigner: Improve file filtering of the resourcegenerator
and collect functions to identify images,
assets and resources in one spot.

Fixes: QDS-12839
Change-Id: I510673b0756dc1e580d753f54831b4c23224056b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-06-17 09:34:58 +00:00
hjk
625fd895ce Fix more metatype related deprecation warnings
QT_DEPRECATED_VERSION_6_0
static int type(const QT_PREPEND_NAMESPACE(QByteArray) &typeName)

Change-Id: I6a085c6d370b6d65193dc09d4318765de81a8ce3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-06-14 11:00:32 +00:00
Eike Ziller
a2a5cab07c Merge remote-tracking branch 'origin/14.0'
Change-Id: I240ecca23ec82e54699fcf11ba1d801d0a8c09f0
2024-06-14 11:27:59 +02:00
Christian Kandeler
ccae4fc93c CppEditor: Consider #pragma once when inserting includes
Fixes: QTCREATORBUG-30808
Change-Id: Ib9f2ed1e428abfaa608b9dc42bc09dd2d403ee56
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-06-13 13:03:08 +00:00
Marcus Tillmanns
20a6a5cd78 Extensionsystem: Allow pluginspecs to customize how they want to check dependencies
Change-Id: I84f3a56160588e4842301f4577f7bfdad96463ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-06-13 12:52:08 +00:00
Marco Bubke
99e5042732 QmlDesigner: Add persistent auxiliary storage
The persistent storage is saving the data in-between program executions.
A sqlite database is providing the backend. The model nodes need an id
to be identified.

Change-Id: I24e4ea5184c04cb6a9e3828059ca593ee41d271e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-06-13 11:27:06 +00:00
Jarek Kobus
c9ce9f819b SubDirFileContainer: Fix manual tests
TaskTree::runBlocking() returns DoneWith enum these days.

Change-Id: Ib6fb1ce3e849586e236c9985461c29695ff9d880
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-06-13 09:52:58 +00:00
Jarek Kobus
e331329e4f TaskTree: Detect a misconfigured recipe of a nested task tree
Change-Id: I6652336023ac111cde5334e655f5dd972977b07f
Reviewed-by: hjk <hjk@qt.io>
2024-06-13 09:17:24 +00:00
Eike Ziller
caa5c3947f iOS: Fix slow debugging with recent Xcode and iOS < 17
When starting the debugger, we need to pass it the location of the
downloaded device symbols, or otherwise debugger startup is very slow.

Xcode changes the location where it saves this information once in a
while, and it must have again. The location with Xcode 15.2 at least is
in the style "iPhone8,1 15.7.3 (19H307)", i.e. it starts with the
"product type" now.

Retrieve the product type of the device and add another candidate
directory for device symbols.

Fixes: QTCREATORBUG-31044
Change-Id: I1a65305fc84c1af8cd48c4ebb249167e1dbe6ae1
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-06-13 06:09:47 +00:00
Sivert Krøvel
98c765d6fc Resolve qmlproject dependencies during conversion
Qt for MCUs modules have their own qmlproject files. To make it
easier to know which qmlproject files belong to a project
the qmlproject dependencies are resolved and listed in the
internal project JSON object when converting a qmlproject file
in QDS.

In Qt for MCUs, qmlproject files are found either in ModuleFiles
nodes or in the importPaths (with some extra restrictions).
This implementation mirrors the dependency resolution in
Qt for MCUs also in QDS.

Task-number: QDS-12636
Change-Id: I7ae874d26beeea0deb440fba031b7a4b11eef1e0
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
2024-06-12 10:26:11 +00:00
Marco Bubke
8d7e62fa5e Utils: Improve tests for small string
It fixes a capacity bug.

Change-Id: I3545eb32d8b23514da286c2df77aebc197df8252
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-06-11 12:16:02 +00:00
Eike Ziller
8bf7967074 Merge remote-tracking branch 'origin/14.0'
Change-Id: Ic38a5b4843f174e51f5ebb97d1636a3283646c34
2024-06-11 10:36:51 +02:00
Marco Bubke
a7309597fa Utils: Optimize smallstring a little more
For string with a larger area we use spend a little bit memory on less
execution time.

Change-Id: I261ada4120de974ce40daaa7f0922af4dd115996
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-06-10 09:18:34 +00:00
Marco Bubke
e7b4b14126 UnitTests: Fix warnings in UniqueName tests
Change-Id: If41125a2cdc7f7502705f079403338bd0eb397e0
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
(cherry picked from commit 12a0a02563)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-06-10 09:17:20 +00:00
hjk
80f46e055c Use non-null valies for LB connection guards
Task-number: QTCREATORBUG-31024
Change-Id: I532d2daade968ff4aa2f3dc1ba89d2a3a4e9c2eb
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-06-07 10:58:42 +00:00
Marco Bubke
b9f28b957c UnitTests: How to write tests
Change-Id: Ic2221a83d139e7d7ad7b4d0f40d602822fb6654c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-06-06 13:16:57 +00:00
Marco Bubke
12a0a02563 UnitTests: Fix warnings in UniqueName tests
Change-Id: If41125a2cdc7f7502705f079403338bd0eb397e0
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-06-06 10:05:53 +00:00
Eike Ziller
2b8d790b77 Merge remote-tracking branch 'origin/14.0'
Change-Id: I4260181d32ed514e1a912188dbf1040857a83f54
2024-06-06 09:02:20 +02:00
Alessandro Portale
0650fe14e5 Utils: Update Figma text tokens
This adds UiElementLabelMedium and UiElementLabelSmall.

Change-Id: I592f2bdf7a4d0a98e38ea69c33cf1b27040f7eea
Reviewed-by: hjk <hjk@qt.io>
2024-06-05 14:30:00 +00:00
Christian Stenger
9a4cae42c0 Tests: Make environment test less verbose
Only print out additional information if the environment
does not match the expected one.

Change-Id: I9be1a90400a180a4cbd0381f54eea79409c007c7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-06-05 11:46:04 +00:00
Christian Stenger
5b93e34c00 Utils: Allow comments in environment items
This patch allows commenting environment changes or adding
comments to the batch edit widget.
To mark a line as comment prefix it with '##'.

Modifying the environment by using the batch edit mode
allows using '#' to disable variables.
Mis-using this to disable statements of the environment
items widget is tempting and other tools explicitly allow
it this way. But when doing so, the environment may get
some unforeseen modifications.
So, explicitly provide a mechanism for comments and be
more clear about this inside the documentation.

Change-Id: I6a58d0d00e996a3f886ec30e826cade324321818
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-06-05 10:48:24 +00:00
hjk
1c9242bab2 LayoutBuilder: Potentially save a few cycles
... by not actually creating the unused instances of the Id types.

Change-Id: I6955046fa1b457ea70d36090d3bf0051b31dfdaa
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-06-04 10:52:59 +00:00
Eike Ziller
3d828123be Merge remote-tracking branch 'origin/13.0' into 14.0
Conflicts:
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: I71bfee426a3e25ab7c7cd276ffe1e7d8fe550ffe
2024-06-03 12:23:06 +02:00
David Schulz
a1727a9d6d Debugger: fix compiling dumper tests
Change-Id: Ic06483bfeee376e9cc3e7beb516b9bde9cb5b46d
Reviewed-by: hjk <hjk@qt.io>
2024-05-31 12:16:15 +00:00
David Schulz
1c2fbaa846 Debugger: track variable fetch time in dumper tests for cdb
Change-Id: I85073edc2e3660e2bfaff32f53e4a2f98f03c514
Reviewed-by: hjk <hjk@qt.io>
2024-05-31 09:22:59 +00:00
Marco Bubke
2ca059e03d UnitTests: Cleanup project item
Change-Id: I28f7f6f7cb1d6bc01876b6ef27565b88b4542d8a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
2024-05-29 10:58:49 +00:00
Tim Jenssen
4515fba526 Merge remote-tracking branch 'origin/qds/dev'
Conflicts: src/plugins/qmldesigner/CMakeLists.txt

Change-Id: I250c8e5284ddb0f335c440999b8920762419c89b
2024-05-28 19:06:18 +02:00