Commit Graph

88653 Commits

Author SHA1 Message Date
Ali Kianian
d7127c3437 QmlDesigner: Fix the bug for crash on saving Model Editor content
Export and write method are available in two different methods

Fixes: QDS-11660
Change-Id: I21658f9ed0d29d95de7ff2f9d940ea69c9f072ad
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-01-18 10:38:17 +00:00
Ali Kianian
b351f0bd67 QmlDesigner: Synchronize the selected collection with collectionDetails
Fixes: QDS-11643
Fixes: QDS-11654
Change-Id: Icf43d2f68b1c4fb4a6ffeb80651b2339b268ccd6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-01-18 10:38:05 +00:00
hjk
1cb58e80d8 QmlProjectManager: Merge the two *constants file
The reason for the split is unknown, maybe just an accident.

Change-Id: I4fadd003ee2e6f8d91ed9494bd2304b2d35eff81
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-18 10:32:28 +00:00
hjk
f52cf6b564 QmlProjectManager: Use setup pattern for QmlProjectRunConfiguration
Change-Id: Ib69a09c65a4755312663286fddbd891c4f7c49ce
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-18 10:18:04 +00:00
hjk
6467797af2 QtSupport: Use setup pattern for UIC and SCXML extracompilers
Change-Id: I4727333e9716eae41ea41a37f032fb44b383212c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-18 10:17:53 +00:00
hjk
a4e6d36427 ProjectExplorer: Move outputparser test class creation class
... closer to the tested code.

Change-Id: Icdc2efcae8bfa6129ed641116ca6e8c917d8c0f3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-01-18 10:16:59 +00:00
hjk
4d1f1f98d1 ProjectExplorer: Move OpenProjectResult off ProjectExplorerPlugin class
It's not really related to the "Plugin-ness", and I'd generally like to
get away from exported ExtensionSystem::IPlugin derived classes as
"entrypoint" with the resulting fat plugin pimpl in favor of more
separate isolated access points.

Change-Id: I445df6109f4231e37750aa15eaa210d6669805e3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-01-18 10:16:25 +00:00
Jarek Kobus
c2e20eafd7 GitLabCloneDialog: Don't delete the VcsCommand when done
This is done internally by the VcsCommand, after the singal
is sent.

Change-Id: I3e6c9b6c465fc48f6cd9dcd3953c22d45757008e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-01-18 10:07:07 +00:00
Eike Ziller
5c726df5b8 ProjectWindow: Initialize vanishedTargetsItem
We check for its existence in rebuildVanishedTargets(),
so this was a potential crash.

Change-Id: I5be2f4bad54cc9b1ce16e2f0ab7e63378379803d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-01-18 09:38:11 +00:00
Jarek Kobus
de5f75292d BuildManager: Reuse TaskTreeRunner
Change-Id: I533d92272a69f96df3efa578960803f81e712072
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-01-18 09:37:24 +00:00
hjk
d86ec67f31 QmlProjectManager: Delay construction of some run worker factories
... until the base factories are there.

Change-Id: I0b3541c32eb7f7bbc24461a0fc9c1be85fc4f29b
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2024-01-18 09:29:16 +00:00
Mahmoud Badri
b6bfdeb0ae EffectMaker: Fix node enabled doesn't save
Fixes: QDS-11611
Change-Id: Ib9dbe5794fa5700f74756eae43efc1db8bfb8a40
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-01-18 09:24:22 +00:00
Mahmoud Badri
6bdaac3b20 EffectMaker: Don't clear effect name when clearing the nodes list
Change-Id: Ic805d72b2600db88dab9887552faa8aef19423d7
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-01-18 09:18:56 +00:00
Miikka Heikkinen
fe6d2aef37 Effect Maker: Make effects children of items they affect
...instead of being inlined into layer.effect. This fixes the issue
with dynamic properties not properly updating for inlined instances
at reset and in general makes the effect properties more accessible.

Task-number: QDS-11357
Change-Id: Ie372b99752ceda5bdfe248dd576352d2c6a4c4f7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-01-18 09:08:23 +00:00
hjk
800007297f QtSupport: Setup DesktopQtVersionFactory, not a single version
Amends 0583fb81ca.

Change-Id: I6d9964b757ca606a8cf9a310118e49711adffd76
Reviewed-by: hjk <hjk@qt.io>
2024-01-18 08:35:06 +00:00
hjk
9f937d04b1 QtSupport: Use setup pattern for QtOutputFormatter
Change-Id: Ic570a6503bedc4685d3d7f6222f1edab33fb6bad
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-18 08:13:13 +00:00
hjk
e0582b5ddd QtSupport: Use new setup pattern for QtOptionsPage
Also, rename it to QtSettingsPage, the current standard.

Change-Id: Ib350efe9b6cd21fd5d22ac7f23e4ab6769a6f3d5
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-18 08:13:03 +00:00
hjk
009febce6e QtSupport: Use setupXXX for welcome page contributions
Change-Id: I5ff8a5527c908381bb67f011d39aaeb926a89c40
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-18 07:44:39 +00:00
hjk
0583fb81ca QtSupport: Use setupXXX for some QtVersion factories
Change-Id: Ib3b0c3e92c826d86fc857b6451d5340126ce43e7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-18 07:21:13 +00:00
hjk
c8bb7897f5 TextEditor: Use new setup pattern for BookmarkView
Change-Id: I934f1bd6cb3889c4199176cf8d15beaee805f86c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-18 07:21:05 +00:00
hjk
b7d646644d TextEditor: Move BookmarkManager instance closer to its code
This is similar to the recently promoted setupXXX() pattern, not
100% there, though.

Change-Id: Ia6b302af5c8b647ed073ec45179eb2413e988885
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-18 07:20:56 +00:00
hjk
ef8323ee96 TextEditor: Move bookmark related action setup
... to BookMarkManager. For less coupling.

Change-Id: I51c88fc9ee9a3456b1075bbe4c7ad039fc6f1889
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-18 06:51:36 +00:00
hjk
89d5c69a79 TextEditor: Simplify TextMarkRegistry further
Change-Id: I61bbc99f0f8e378edbfb5733bffce7b424a36f2e
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-18 06:43:48 +00:00
Tim Jenssen
8763a92274 scripts: add zip_threads argument to every call
Change-Id: Ie3fabbea5e8082f73eac71d8c7650a82fa706b30
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-01-17 19:13:03 +00:00
Tim Jenßen
1a76f3f665 scripts: add build sdk_tool option
Change-Id: I1bfbcb1baead5fe351a785b126540c60bc5db3c3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-01-17 19:12:44 +00:00
hjk
1de4590dde ResourceEditor: Code cosmetics
Change-Id: Ic051cc76162bfc7c24f78505adc801f6f7fbc47c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-17 17:02:29 +00:00
hjk
18ebb39126 ResourceEditor: Drop the plugin pimpl
Not really needed anymore as separate class.

Change-Id: I16c3248a34a448935b4a92f484c4f18ac2b53790
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-17 16:39:55 +00:00
hjk
c121ec656f ResourceEditor: Rename oddly-named resourceeditorw files
Change-Id: Idfa59b2562e30c80eed5ffe378f1b2a8743463b9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-17 16:17:19 +00:00
Dominik Holland
e8f24f2e12 AppMan: Decorate all Application names with [App] and (Run on ...)
Change-Id: I6a5050f431a46c656c17ea476de3bb0f4292d699
Reviewed-by: hjk <hjk@qt.io>
2024-01-17 16:03:35 +00:00
Dominik Holland
1d3db8afc3 AppMan: Add support to change the Environment in the RunConfiguration
Change-Id: I05e0df8abf40b3f1a55edc1ab1419a04b1060fa7
Reviewed-by: hjk <hjk@qt.io>
2024-01-17 16:03:25 +00:00
Dominik Holland
09c549d12f AppMan: Update Aspects of all deploy steps
Remove all custom Aspects we don't need anymore.

Change-Id: I201a500e9a2c31b8787bc2b093dc671cdab917a8
Reviewed-by: hjk <hjk@qt.io>
2024-01-17 16:03:09 +00:00
Dominik Holland
15d0402694 AppMan: Add Aspects to the RunConfiguration
Change-Id: Icf817279d76213bc5875f12ee74151f3d8fb1f44
Reviewed-by: hjk <hjk@qt.io>
2024-01-17 16:02:55 +00:00
hjk
5dfd572f0f ResourceEditor: Rename odd ResourceEditorW to ResourceEditorImpl
In theory, that could be class ResourceEditor, but used for the
namespace too, and that's calling for moc trouble.

Change-Id: If0a06658a4e82c9519862519dd19f80aeedb4707
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-17 15:47:51 +00:00
Christian Kandeler
7197c7be3d Fix qbs build
Change-Id: Ie4337d3d456ff3fea92468054d90727b49cd1b35
Reviewed-by: hjk <hjk@qt.io>
2024-01-17 15:28:06 +00:00
hjk
f5d4d331c4 Make some more capturelists friendlier for C++20
Change-Id: Ic00f75e1f59f5eb0430d24e4448a3bb7f8bfbd8d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-17 15:18:41 +00:00
hjk
164a6e7447 Qnx: Use ActionBuilder for Attach action
Change-Id: Ieb7fb38f1e293e61b7ca0e543e7066018cf32d5e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-17 15:16:25 +00:00
Dominik Holland
03acd8f109 AppMan: Enable debug support only for the "qml" and the "native" runtimes
Change-Id: I6858bebe172a8a4b0694b335eeaeb03e1404e8b0
Reviewed-by: hjk <hjk@qt.io>
2024-01-17 15:04:32 +00:00
Dominik Holland
1d4d9703a8 AppMan: Remove AppManagerMakeInstallStep
Change-Id: Ia14b925f513da507bda80ab4a4fc39b6e6deded7
Reviewed-by: hjk <hjk@qt.io>
2024-01-17 14:55:31 +00:00
Dominik Holland
16e6c8dcb9 AppMan: Fix getToolFilePath to return the correct tool path
Change-Id: I790d2b231b84ef55a0ae5e9502e29a6337e83db8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-17 14:55:13 +00:00
Dominik Holland
4c52ed979e AppMan: Remove circular stopDependency in the DebugSupport
This prevented the debugger to stop correctly.

Change-Id: Ie7aab0d62662c03f8ad6bb6c3b49d590a127fa68
Reviewed-by: hjk <hjk@qt.io>
2024-01-17 14:55:02 +00:00
David Schulz
03958b5806 CppEditor: avoid endless loop in symbol name lookup
Passing and empty text to QString::indexOf returns a 0 index and we
advance the start index by the length of the symbol name so we check
again from the start. Just assert if we pass an empty symbol name to
symbolOccurrencesInText and return an empty list of occurrences to avoid
this.

Task-number: QTCREATORBUG-30155
Change-Id: I6ad672a3dc2ae9d937fdc436874d07c00997fbf5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-01-17 14:20:00 +00:00
Marcus Tillmanns
f5934d69de QtSupport: Remove dead code
"SourcePath" was meant to be set by the installer to make it easier
to find the installed source folder for a specific Qt version. This was
never implemented in the Installer and a workaround was later
created for it.

This patch removes the dead code.

Change-Id: I1c2f5c10e37a7df4643327d1071db9e2e62c8212
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-17 13:50:19 +00:00
David Schulz
45ef64f4f9 Python: fix venv check
FilePath::contains only checks whether the passed string is inside the
path, and not whether the path contains a folder or file with the passed
string.

Change-Id: I20a1a9a52a9f9a436433848ac2eccd38666274d7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-01-17 13:33:47 +00:00
Jarek Kobus
443ce8e164 Process: Get rid of ProcessInterpreter
Move it locally to the only one user: VcsCommand.

For the future similar usages: use ProcessTask
and tweak the DoneResult inside TaskDoneHandler.

Change-Id: Icdffee7f1963f3ff377bfa6309e14bd1862a2c1f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-17 13:27:55 +00:00
Jarek Kobus
6042f6fde4 VcsCommand: Interpret exit code locally
Don't pass it to the Process instance.

Change-Id: I0891f85414d52cdab1f95cc3f37610ebe06a5955
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-17 13:27:47 +00:00
Jarek Kobus
312e50d29b Process: Introduce exitMessage() helper
This is going to be used for tweaked process result.

Change-Id: I1e4117dcd6145e4748a55c285b2546974a6e7d00
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-17 13:27:41 +00:00
Cristian Adam
d5a5088996 QtSupport: Increase QtVersionData's version to 3
Qt Creator 12.0.0 has created presistent storage with empty QtAbis list.
Qt Creator 12.0.1 has fixed this issue.

By increasing the version number to 3 we force the saved data from Qt
Creator 12.0.0 to be recreated, and thus fix Android issues with empty
QtAbis lists.

Also make sure that an empty QtAbis is loaded.

Fixes: QTCREATORBUG-30208
Change-Id: I89a9a1ff810304127ff0387b80cb9a13f9740538
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-01-17 13:27:12 +00:00
Cristian Adam
7fa70da159 PE: Set Android ABI to the Abi object instantiation
640a4f0c9c introduced caching of qmake
output, which includes the supported abis.

Unfortunately the Abi::toString and Abi::fromString didn't serialize the
m_param value which was used by the Android plugin to specify the
Android ABI.

This commit will generate the Android ABI from the existing values.

Fixes: QTCREATORBUG-30146
Change-Id: I6770faa3953f7b423b36b9e3654a7e270d051571
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-01-17 13:26:49 +00:00
Jarek Kobus
4c0541ce2f CtfVisualizer: Reuse TaskTreeRunner
Change-Id: If893cdd260943a5e72b05595f15c3133e4340f8f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-17 13:14:01 +00:00
Jarek Kobus
0f67bbf872 Android: Reuse TaskTreeRunner in AndroidSdkDownloader
Change-Id: I3fca36d2cab44212d6a18daba68b7d27bf35b078
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-01-17 13:13:49 +00:00