Commit Graph

68765 Commits

Author SHA1 Message Date
David Schulz
3ef343bbf8 Core: Improve readability of searchresult error messages
Task-number: QTCREATORBUG-29824
Change-Id: Ic26a6671b886d74ab2aac1d8e1baa66bd9fe7f8d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-14 13:18:58 +00:00
Henning Gruendl
4da241f26f QmlDesigner: Make recent project removable
Add functionality to remove individual recent projects and the complete
list of recent projects.

Task-number: QDS-6606
Task-number: QDS-8761
Change-Id: I8ff4de918ebb2f7a6ffb06e6d3ba04e38eb7f386
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-14 13:16:52 +00:00
Christian Kandeler
74a089f3ea CppEditor: Fix the lookUpDefinition() function
... that tells us whether we need to offer the "add #include" quickfix.
If we encounter a forward declaration, we cannot return yet, as a proper
declaration might still show up.

Fixes: QTCREATORBUG-29883
Change-Id: Ie1b831b9414043c3fc0d5d1e914b6096957757e6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-14 13:07:43 +00:00
Sivert Krøvel
b080a3772c Handle nodes and properties required by MCUs in JSON conversion
Qt for MCUs uses several features in the qmlproject files which
are unknown to QDS. It is important that this information does
not get lost when converting to and from the internal JSON
project format, to avoid breaking MCU projects.

The following changes were made:
- Files nodes keep the type (ImageFiles, QmlFiles...)
- Added support for more Files node types used by MCU projects
  (ModuleFiles, InterfaceFiles, FontFiles...)
- Files nodes can have child properties
- Added a JSON object to store properties unknown to QDS.
  They may be used by Qt for MCUs, and new properties may
  be added between versions
- Added support for the MCU.Config and MCU.Module nodes
- Added a test project for MCU. This project is also tested
  with Qt for MCUs. Both the original and the converted
  project build correctly
- Added instructions for notifying the MCU team before
  modifying the MCU test cases to avoid breaking changes.

Fixes: QDS-10774
Task-number: QDS-10969
Change-Id: I0dfd7f3b150a8661fc0398a8a3d575c7e8777ef3
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-14 12:22:36 +00:00
Mahmoud Badri
820b1ce2d0 QmlDesigner: Remove collection editor's id role
It is not needed, and implemented wrongly anyway.

Change-Id: I17a1565912c1d3f68f273e314b58b1998aced03d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Shrief Gabr <shrief.gabr@qt.io>
2023-11-14 12:16:48 +00:00
hjk
8290a7636e ProjectExplorer: Really don't create replacment kits for Design Studio
Amends b5dec80d6b.

Change-Id: I34b263626c66dfec2676ff311d1f5e460333b924
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-14 11:06:05 +00:00
Miikka Heikkinen
6276658e52 EffectMaker: Update QSB tool parameters
With updated parameters, same shader versions will be generated as
with the standalone effect maker tool.

Task-number: QDS-11194
Change-Id: Id7c0b36e7526a8e285d02b9102a65aac954b3d98
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-14 10:52:27 +00:00
Karim Abdelrahman
2dae80de93 McuSupport: detect if a project is QtForMcu
Update the way we used to check for mcus
project in McuSupport plugin. The old way
relied on the deployment step which is only
available when the user has already added a
valid QtForMcus package to "Devices->MCU".

The addition of "isQtForMcusProject" in
externaldependenciesinterface.h will be
used in a follow-up patch in
qt-creator/tqtc-plugin-qtquickdesigner
which adds a warning when using .qtbridge
for Mcu project.

Task-number: QDS-10599
Change-Id: Ibf46477a4f0cb4a82a10ac848acec75458bf6c03
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
2023-11-14 10:27:59 +00:00
Miikka Heikkinen
d581c80fe6 Use OpenGL core profile for macOS
Some of the shader features we use in Effect Maker plugin require newer
OpenGL than the macOS default.

Task-number: QDS-11194
Change-Id: Iad166a9f99b2a8fc37b0f9912947cf63ef4b3328
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-14 10:16:14 +00:00
Christian Stenger
45858f739a McuSupport: Fix building tests
Change-Id: I9473805663ea2d33ddf600ae06c455b139bac89b
Reviewed-by: hjk <hjk@qt.io>
2023-11-14 07:52:42 +00:00
Thomas Hartmann
dd2a290963 QmlDesigner: Adjust display strings for connections in context menu
Change-Id: I2f89413cfe86aad2f365acf9aaba378047e54cca
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-14 07:49:25 +00:00
Shrief Gabr
0bcd0b915e QmlDesigner: Detect data types for CSV models
Task-number: QDS-11081
Change-Id: I88418e31f0fd033d7d5ec3c03fea26ae1e4e2362
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-14 07:25:56 +00:00
Aleksei German
baf0fc9598 QmlDesigner: Fix the wrong environment list
Change-Id: I3dbab618d9af457f0c9a442b94e84ad6a9220f4e
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-13 19:49:54 +00:00
Yasser Grimes
8f47454b6e McuSupport: Show only the MCU tag for QtMCUs projects
As older QtMCUs projects supports only Qt5 and newer ones supoprt only
Qt6 This change disable showing QtX tag for QtMCUs projects.

Fixes: QDS-10333
Change-Id: I379a84948efe2f8cad21245859dc53f7f26ff9d3
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-11-13 17:00:46 +00:00
Thomas Hartmann
850e6d3ecc QmlDesigner: Add tracking of time to new effect maker
Change-Id: I3182b059efacbddc4be2d63a4096ab8f1326abfb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-13 16:46:38 +00:00
Thomas Hartmann
eef9508b35 QmlDesigner: Remove states from property order list
Having the property hear leads to peoperties be added after states.
Since states is an array property we do not want this.

Change-Id: I4688c5cdbadffd4072a575a43ca3753f5db378c8
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-11-13 16:46:29 +00:00
Thomas Hartmann
2ef1cd51b9 QmlDesigner: Add tracking of usage to model editor
Change-Id: Icb1de1537ac7a43741cbe2563322919978d91928
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-13 16:46:19 +00:00
Shrief Gabr
41b7e727a8 QmlDesigner: Prevent Csv import dialog from importing unsupported files
Task-number: QDS-11179
Change-Id: I31b947066571864c97b7604970d5b7ef7921a441
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-13 14:50:01 +00:00
Xavier BESSON
223deb5968 Shortcut to enable/disable shortcuts routing to terminal
Fixes: QTCREATORBUG-29876
Change-Id: I8b04c09ce1de7dab968499773179f663c1c6fe7d
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-11-13 13:41:04 +00:00
Alessandro Portale
218f346fcc Utils: Prevent temporary duplicated display of InfoBar items
The delayed deletion of InfoBar items can cause short lived but visible
duplication of InfoBar entries. This change hides the obsoloete items
immediately to prevent that effect.

Fixes: QTCREATORBUG-29877
Change-Id: I6ed428185849f22f8d87f68cf1a5fac610e9dddf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-13 12:20:55 +00:00
Jarek Kobus
aef4c32809 CppFileSettingsWidget: Add missing Tr::tr()
Change-Id: I1feea8db0597d48f7fb966c786103393d0d91487
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-13 08:22:00 +00:00
Thomas Hartmann
5c830613e8 QmlDesigner: Fix reflection in states editor
We block reflection, therefore the model has to be
explicitly reset. Blocking reflection also in propertiesRemoved.

Change-Id: I0de1172c0b066fa71494c7b07331fa19f7fa502c
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-11-10 16:42:06 +00:00
Thomas Hartmann
2d07c94d35 QmlDesigner: Show warning if collection editor cannot be created
Change-Id: Ia0aea335f58c6e206dd23e004c081a43a96abf4c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-10 14:45:11 +00:00
Tim Jenßen
172f889223 qds: enable EffectMakerNew
Change-Id: Id1170ba7d9e61102c2e1d400f184ff3da53eacc2
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-10 14:18:50 +00:00
Thomas Hartmann
6d3c08ac4b QmlDesigner: Always enable model editor
Change-Id: I4a83b4b61e468b6db6c2930fa4e8ae470f8dbc72
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-10 14:17:49 +00:00
Miikka Heikkinen
d0a7b9b359 EffectMaker: Fix qsb tool version parameter
Change-Id: I4a1ceafba63d466d9cec555b332d6894b1016ba4
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-10 13:38:45 +00:00
Jarek Kobus
c5cb637b96 SettingsDialog: Use locale aware sorting
Still it's not perfect, as it seems the order is like:
"Qt Quick", "Środowisko", "System kontroli wersji",
while the proper one should be:
"Qt Quick", "System kontroli wersji", "Środowisko",
but that's still better than before, when
"Środowisko" was after the letter "Z".

Change-Id: Ib1642f54ed57f798a614f1f3a2d805fb1fdaf1bc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-10 12:15:11 +00:00
Cristian Adam
f90f60bb32 CMake: Fix QTC_STATIC_BUILD
Change-Id: Idfcd36f2d5fdaf09c958ff101aa5e83e0a29cb58
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-10 10:11:18 +00:00
Yasser Grimes
52818b8367 McuSupport: Prevent crash while selecting QtMCUs kits for previewing
Users tend to select QtMCUs kits when opening a QtMCUs project in Design
Studio this leads to a crash on some of them because of incompatible or
broken kit configurations (but not QtMCUs desktop kits)

This patch will prevent the crash by preventing the use of QtMCUs kit
and issues a warning about it.

Fixes: QDS-10143
Change-Id: I54acd7b3f1439492bc37979028a1c2d4548da4cf
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-10 09:36:29 +00:00
Ali Kianian
c2581b3bc4 QmlDesigner: Consider an initial value for the model files
Task-number: QDS-11176
Change-Id: I5d35628022194760f63f26c67bc273d02b061575
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-10 09:29:33 +00:00
Thomas Hartmann
4121772030 QmlDesigner: Open Connection Editor from context menu
Open the ConnectionsDialog from context menu.

Task-number: QDS-10711
Change-Id: If0b78dc3d9820cdefa7efe9c85dacfae8f3d1d40
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-10 09:28:31 +00:00
Ali Kianian
acd4792ded QmlDesigner: Prevent accepting invalid lines on collection sort
Task-number: QDS-11117
Change-Id: Id603e5a5b85e99cf87972c853b130b26a195b223
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-10 09:27:40 +00:00
Henning Gruendl
0d6e2b10a2 QmlDesigner: Rename window manager uri
Change-Id: Ied88f4cbc394d8faba7280fbd1af210bb7daf76a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-10 08:35:24 +00:00
Amr Essam
c946a30f36 QmlDesigner: Save effect resources
Also effects are now can be dragged in the form editor

Task-number: QDS-10500
Change-Id: I5a701b8077231bcbb299c0c4f1cbf2f5173a14dd
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-09 23:05:34 +00:00
Ali Kianian
0b50d22bbd QmlDesigner: Rename some expressions
Task-number: QDS-11168
Change-Id: Id402267708eeed794b78766e9b5504fbb636d357
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-09 17:51:36 +00:00
Henning Gruendl
6b2963e678 QmlDesigner: Add color editor to StudioControls
* Add QML Window based popover to StudioControls
* Add color editor to StudioControls
* Move color editor modules to StudioControls
* Move IconIndicator to StudioControls
* Move ToolTipArea to StudioControls
* Add color backend to qmldesignerbase to allow control value binding
* Use popover in connections editor
* Add window manager to send focus changes to QML Windows
* Update ColorEditor UX
* Remove HelperWindow workaround for GradientPresetList (Qt 5 vs 6)
* Fix eye dropper for QWindow

Task-number: QDS-10926
Change-Id: Ia87b30543affde88faaef2ebdf120cb5d348c935
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-09 15:05:50 +00:00
Christian Kandeler
e3c1179abb CppEditor: Manually indent moved comments
Using the indenter yields unepected results in certain contexts.

Fixes: QTCREATORBUG-29786
Change-Id: Id15eff841d2aa54e7fff65c6bf728516e03f9fc6
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-09 12:51:10 +00:00
Yasser Grimes
8f57d1ec0e McuSupport: Add Shapes moudule include to qmlprojectexporter deploy step
Task-number: QDS-10814
Change-Id: I0453360a501a2cdb21522a6f257523899b36df95
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-09 10:14:40 +00:00
Amr Essam
0cbda147a8 QmlDesigner: Export effect maker composition qep project into assets
Meanwhile, composition resources are not yet exported

Task-number: QDS-10500
Change-Id: I3687d1d62a64472c7ec84716c584dced5fbb6a85
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-09 10:02:19 +00:00
The Qt Project
841d9d739e Merge "Merge remote-tracking branch 'origin/12.0' into qds/dev" into qds/dev 2023-11-09 09:24:26 +00:00
Thomas Hartmann
070022e9e2 TextEditor: Allow to programmatically highlight a block by cursor
This can be used in QmlDesigner to highlight the currently selected
QML object.

Change-Id: I9907d54f767c7d034739d4111a46cd994c961426
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-09 08:53:25 +00:00
Tim Jenßen
058fd820e5 Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: I1e38a9dc4402a4cf836c32a6b0e5f49a836574b7
2023-11-09 08:46:51 +00:00
Thomas Hartmann
ad49605ea9 QmlDesigner: Highlight selected node in code editor
We also highlight the drag target when using drag and drop.

Task-number: QDS-10869
Change-Id: Ic396848f93deaa3cce899c2cf431d5a7f5a940f5
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-11-09 08:46:33 +00:00
Christian Stenger
e5c4d20e2b LanguageClient: Reset maximum restart tries on explicit restart
If the user forces the language client to restart for whatever reason
the client may end up in not starting anymore depending on the
number of restarts that had been done already.
So, explicitly reset the counter in case the user triggers the
restart.

Change-Id: Ie5f33c8dc3d565b6126badc9708906fc14f4e743
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-09 07:58:13 +00:00
Christian Stenger
4436e96f91 Debugger: Fix compile with Qt6.2
Amends 43f99cb53b.

Change-Id: Ia28b129f761e8cfe6dd3a908ccfcf50d043d1639
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-11-09 07:16:08 +00:00
Marcus Tillmanns
6e1d7fc961 CompilerExplorer: Fix crash on undo
We need to store the source text document so that when the editor
is remove and the user triggers undo/read, the pointer is still valid.

Change-Id: I571906db1c4424455172a42d72351cd9ba1e7c03
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-09 05:55:08 +00:00
Marcus Tillmanns
e4805b88c9 CMakePM: Use FilePath::fromUserInput
Change-Id: I748fc41ed380c907b6edcca3a1802a47f9f74436
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-09 05:53:36 +00:00
Thomas Hartmann
036963de02 QmlDesigner: Add signals of dynamic properties
We have to take into account that signal themselves
are considered dynamic properties, but do not require
the changed suffix.

Task-number: QDS-10977
Change-Id: I6af83586eee1b8f37e0510839baecee42972494c
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-08 15:44:40 +00:00
Mahmoud Badri
d9ab8e8bef QmlDesigner: Update light baking and effect maker pause icons
Also hide the code icon from effect maker

Change-Id: I1045a0718b5b86ef13164e215e5f0f1420487497
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
2023-11-08 14:53:15 +00:00
Mahmoud Badri
514b070a4c QmlDesigner: Update icon font
Added icons:
addGroup_medium.svg
assignTo.svg
bakeLights_medium.svg
listView_medium.svg
pause_medium.svg
tableView_medium.svg
warning_medium.svg

Change-Id: I17c39fdd771e3391ae6a37f171223fdea0e773fe
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-08 13:48:40 +00:00