Commit Graph

72811 Commits

Author SHA1 Message Date
Knud Dollereder
3721620799 QmlProjectManager: New project structure support for CMakeGenerator
- Add writer interface in order to support the current and the new
  project structure in parallel. Using the new one if
  qdsVersion is >= 4.5
- Separated templates for the new generator from the old one
- Add file name validity check
- Generate files in the folder src and cmake if they do not exist yet.
  Only re-generate files in src/autogen.
- Add action to enable or disable the cmake-generator
- Add function that checks if a resource file is within the
  project folder but not part of the project

Change-Id: I3d75dbee1043ed28e6126cf0b2c83994cb70ed45
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-03-28 13:52:32 +00:00
Artem Sokolovskii
1d28b90037 Dap: Fix typo in python engine
Change-Id: I456b909a31be734acc4c7ec9f0eb2de94bb5b0e2
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-28 12:39:05 +00:00
Tim Jenssen
510c15083b QmlDesigner: optimize Model::generateNewId
Change-Id: I3b4949133b16a955678528dd8a139fde5c51edd2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-28 11:19:38 +00:00
Burak Hancerli
933958e174 ResourceGenerator: Increase the compression level
Change-Id: Ifa099590e4a0cdd8d07b1865ddc1d64eb7d32af1
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-28 09:43:45 +00:00
Mahmoud Badri
c04eb4444d QmlDesigner: Use ExamplesModelV2
V2 adds minQDSVersion property for model items

Change-Id: I27d36428f73b27b1d52d429e23654d094d6ff86d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-28 09:18:39 +00:00
Thomas Hartmann
ff4e33dc0a QmlDesigner: Enable rendering of DesignerEffects
* Effects are items and we have to use __effect/source and allEffects
  to idenfify them and get the correct bounding rectangle.
* For now we use a custom parser to work around issues when editig the model

Change-Id: I78690498c44f8285d3bb6ce78eafcafb9c26b2f1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-28 08:26:59 +00:00
Marco Bubke
385cf4d89c QmlDesigner: Fix taskqueue
The joinable thread was under the locked mutex. So the sleep notifier
could not arrive.

Change-Id: I548c89904b09f8dcc02cb7ae0486880f519915d2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-27 17:46:56 +00:00
Thomas Hartmann
89af0ad08a QmlDesigner: Fix capitalisation
Change-Id: Iba1927368be4f06dea87132fe8a4e81db819a293
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-03-27 13:29:00 +00:00
Miikka Heikkinen
fd3047bac2 QmlDesigner: Join sleeping task queue thread
Threads are still considered joinable after their execution. So sleeping
thread have to be joinded first. Add test

Fixes: QDS-12308
Change-Id: Ie01588293e3b7ce9fe149d52a25ba03d174cca88
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-27 11:05:37 +00:00
Pranta Dastider
3bbe1c0452 QmlDesigner: Update Tooltips for Qt Quick Layout components
This patch update tooltips for Qt Quick Layout compoents.
It also update tooltips of the relative properties.

Fixes: QDS-12283
Change-Id: I6c4d76602668dc7258cce7ff4fab4b547d8f5d0f
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-03-27 10:02:42 +00:00
Thomas Hartmann
f63bd7f933 QmlDesigner: Crash fix
* Add QTC_CHECK for crash
* ActionAreas should not be "garbage" collected if they have no target.

* Initial ActionAreas do not have a target and ActionAreas without target make sense to a user. We do not want to delete them together with the target.

Task-number: QDS-12181
Change-Id: Ie520c47aad990a8ff07fc3346e6772226d334ce5
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-27 09:33:20 +00:00
Christian Stenger
830e09ccca QmlJSEditor: Fix hovering color properties
Color properties set with hex color values display a
color tool tip, but named colors failed for Qt6 while
it was still working with Qt5.

Change-Id: I6457bbdc86dd7f036bc48dc40cfa16cda570b95f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
2024-03-27 09:10:14 +00:00
Christian Stenger
718fdcc607 Axivion: Fix crash on close
Fixes disconnecting the correct connection.
Amends 99aed851ef.

Change-Id: I3175291086b08ad5434c4211aba51bd5eb439e24
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-03-27 09:09:46 +00:00
Tim Jenssen
8a18423175 Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I28e2e8cacf9a20c8b2f5073f4a492862d814fb99
2024-03-26 15:59:34 +01:00
Alessandro Portale
44bf71169c Revert "Android: Speed up startup by using existing Qt6 Information"
This reverts commit 16c12f71ff.

Reason for revert: Introduces bugs.

AndroidQtVersion::addToEnvironment() set varying ANDROID_NDK_PLATFORM
values in successive calls. Only after a call of
QtVersion::ensureMkSpecParsed, a consistent value is set.

The symptom could be fixed by adding QtVersion::ensureMkSpecParsed calls
in strategic places (e.g. in the beginning of
AndroidQtVersion::addToEnvironment), but it does not make me confident
that this covers all potential code paths. The change that introduces
the issue is 16c12f71ff and will therefore
be reverted. It may be resurrected in QtC 14, but with much caution.

This issue seems to be specific to qmake. It hardens my impression, that
there are no easy gains to be made in the current state of the Android
plugin. An improvement for one use-case will break another use-case
which may be fixed only after two release cycles. It is Mikado code:
"Only touch if needed and safe".

Change-Id: I6ad860f6af8848a900d9421837a03929f9a57645
Fixes: QTCREATORBUG-30554
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-03-26 13:38:34 +00:00
David Schulz
fc8f1bc47d LanguageClient: pimpl DiagnosticManager
Change-Id: I4b5a2b0fe9818b676d08fd00f33b70366394539d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-26 12:40:35 +00:00
Dominik Holland
7561612b3a RunControl: Also check for a matching runConfig when creating a RunWorker
Change-Id: Ic26b41e878ed2b8b20099b62ed1c122966165665
Reviewed-by: hjk <hjk@qt.io>
2024-03-26 10:31:43 +00:00
Ali Kianian
4e63bcb744 QmlDesigner: Fix the bad access for the listModel of the model editor
Change-Id: I9954e11135ab5913a82f12067291b04f22fbe5d2
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-26 08:56:21 +00:00
Marco Bubke
41f3eaa3a9 Sqlite: Fix prepare tracing
Change-Id: I2b0c36789886d0924ac8130a4d46f3c13fc7518b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-25 16:15:20 +00:00
Marco Bubke
c76c90b601 QmlDesigner: Add tracing for project storage updater
Change-Id: I4579a256e4402a045d906a36940582b8e0ff196b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-25 16:12:21 +00:00
Marco Bubke
12785d4eee QmlDesigner: Fix syntax error by removing function
It is not needed anymore and can be removed.

Change-Id: I610529e8e02797813d2cf76c047b89525505178f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-25 16:10:24 +00:00
Thomas Hartmann
96cd6bd738 QmlDesigner: Allow any QtQuick version
Change-Id: Iec353fb6103ae39a1c75ed2695692541a42265df
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-25 13:14:50 +00:00
Sami Shalayel
1d0246a89a qmljshoverhandler: do not show tooltips when qmlls is enabled
Check if qmlls is enabled before showing tooltips from the QtC's code
model. This way, other hoverhandlers, like the one used for language
servers, have the possibility to show their tooltip.

Task-number: QTCREATORBUG-29826
Change-Id: I5d879c7d4c04a27bc668e8900f54984788b02727
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2024-03-25 09:18:55 +00:00
David Schulz
d4e775ebc6 TextEditor: handle syntax highlight in batches
Use an elapsed timer in the syntax highlighter to periodically return
from the highlight and push a continue highlight to the end of the event
loop.
This allows the user to interact with the editor in between those
batches. If the user modifies the document in between highlighting
batches, the area that still needs a rehighlight is increased if needed.

This also reverts 62ea85ee6a and the
related changes.

Task-number: QTCREATORBUG-28727
Change-Id: I7c394dbdff658330bb72f3b68b9928980947db75
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-25 08:57:37 +00:00
Ali Kianian
130d7c69ec QmlDesigner: Improve selecting and viewing the added rows/columns
Fixes: QDS-11762
Fixes: QDS-12058
Fixes: QDS-12066
Fixes: QDS-12159
Change-Id: I81efce31fd6f6e48d4109cb397435972f562ae14
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-03-22 21:17:51 +00:00
Christian Stenger
99aed851ef Axivion: Improve path mapping
If the linked project is not the top level project our
path mappings did not work.
Try to get the correct file path by using QC internal
find functionality.
This helps for opening files by activating issues inside
the issues table or when clicking links of the issue
details.
Unfortunately this does not help for the inline
annotations or respective marks.

Change-Id: Ie34e1b20ff8b1b2b37e9f04c1d41bc2a4c33f260
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-03-22 15:05:45 +00:00
Christian Stenger
34eeda4b05 Axivion: Ensure buttons are exclusive
Avoid having none of the buttons selected which looks
confusing.

Change-Id: I445c4da970c4dfbd8a35228e31092c788d0b5d37
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-03-22 15:05:33 +00:00
Christian Stenger
551d5e1b09 Axivion: Provide find support on project list
If the list of projects is long it is hard to get to
the right project.
Make it a bit easier.

Change-Id: Ifb56bda163ea9450831682c4ea4ccc1a2cb8ffd4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-03-22 15:05:23 +00:00
Eike Ziller
8500dd03bf Merge remote-tracking branch 'origin/13.0'
Conflicts:
	doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc

Change-Id: I2db85da9f4a0593217951313020d71d430986961
2024-03-22 15:13:34 +01:00
Miikka Heikkinen
e4429401d5 EffectComposer: Add extraMargin property for generated effects
Extra margin property is added to effects that can spill outside the
source item. This property specifies the amount of space outside the
item that the effect is allowed to use for rendering.

Fixes: QDS-11607
Change-Id: I36d7392593faa6deb99726eaa02184aa87aa3571
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-22 13:40:25 +00:00
Miikka Heikkinen
5f055fed2d QmlDesigner: Render effected items with extra margin correctly
Replaced old hardcoding of 40px margin for effects with actual
sourceRect of the layer. Also check for effect first before clip, as
that clip doesn't actually affect the clipped item itself,
it only affects the children of the clipped item.

Fixes: QDS-12303
Change-Id: Ia962c74cdefb16ed17bea34f0fc50649256d78fe
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-03-22 13:18:43 +00:00
Marco Bubke
c22ad94518 QmlDesigner: Invalid check should always come first
Change-Id: I312b60dd3bf3ea043b0e0a63a56eaf1d686fa5cf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-03-22 12:03:59 +00:00
Shrief Gabr
002bfbf80f EffectComposer: Add 'reset' button for values
Task-number: QDS-11719
Change-Id: Ia03366bf109427fbcfe5cc1d4f68ae97fa8dc256
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-03-22 09:55:30 +00:00
Christian Stenger
36a00855bb Axivion: Fix reaction on setting changes
While refactoring the signal got lost, bring it back.

Change-Id: I6b7d2764a5acc390c189b8d0000adc74ee2a4a9c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-03-22 08:49:59 +00:00
Jarek Kobus
c10b34c1e1 Axivion: Reuse the redirected url for further usage
Do it even when the network reply fails, but contains
the valid json content.

Fixes: QTCREATORBUG-30536
Change-Id: I97f55ccf6997cd2c9ac6be72d673d9cee1a210de
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-22 06:48:33 +00:00
Marco Bubke
aa76098dc1 Nanotrace: Fix static string
It could easily overflow.

Change-Id: I82c5611aa082bf3e8af394259ad8e15387b3e920
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-21 21:08:15 +00:00
Marco Bubke
5e126b794c QmlDesigner: Add root module path
The root path was missing for the lite designer.

Change-Id: I4c24667e1e46c9c2443224d8bae183c7b91a616e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-21 21:07:58 +00:00
Marco Bubke
39a2b8f2e6 Nanotrace: Initialize variables
Change-Id: Id80d6324a287e7391a4a7b32c495869a9312bef3
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-21 21:07:50 +00:00
Marco Bubke
06f75dbdbf Nanotrace: Add generic map support
Change-Id: I5622697e7c5a34e204d045d61bafa874ce3783d5
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-21 21:07:40 +00:00
Tim Jenssen
431d29859b QmlPreview: add newly introduce dependency
TextEditor for qml files has a preview action nowadays.

Change-Id: I963ef8be8627e14ef56f18bbbc56b9007c5c69d2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-21 19:48:10 +00:00
Tim Jenssen
8f0d2117e0 QmlJS: remove old/unused qmljsindenter
Change-Id: Ie21d838fc1c67c1a690869081f86e3fe7b242d2c
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2024-03-21 19:47:20 +00:00
Cristian Adam
e57e0b0bfa Terminal: Fix terminal resizing on Windows using ConPty
The official ConPty API doesn't give the ability to forward "--
resizeQuirk" to "conhost.exe".

Fixing this involved taking parts from the WinConPty
implementation (https://github.com/microsoft/terminal/tree/main/src/
winconpty) and porting them to work inside ptyqt.

Fixes: QTCREATORBUG-30007
Fixes: QTCREATORBUG-30558
Change-Id: I45e81fa167c88a85b44958eade0d85f7680e8075
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-03-21 15:54:32 +00:00
Alessandro Portale
43f760cf3f Android: Introduce constant "firstQtWithAndroidDeployQt"
Replace a couple of QVersionNumber(5, 4, 0) with it.

Change-Id: Iebc39a534500992c8eb4d72d34d71fe621b8c7c0
Reviewed-by: hjk <hjk@qt.io>
2024-03-21 15:17:56 +00:00
Marcus Tillmanns
a2fa009b8b Core: Set default reload behavior to ReloadUnmodified
Change-Id: I5b3e8d5371d1f9e571103a0578674e3646627e80
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-03-21 11:26:41 +00:00
Mahmoud Badri
9d451d54c8 QmlDesigner: Add and update the fly camera speed config icon
Change-Id: I3d956b04fb7f2e44a5d31c1561a2a341d27cc32b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-03-21 11:07:48 +00:00
Christian Kandeler
5afdc47760 LanguageClient: Prevent duplicate references due to file aliasing
This problem has been observed with clangd, but it's probably a good idea to apply the check generally.
Note that in the case of renaming, omitting the filtering can lead to file corruption.

Task-number: QTCREATORBUG-30546
Change-Id: I007edbae2cba5f59e427ab07e183162df9e99367
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-03-21 08:55:01 +00:00
Thomas Hartmann
1dcfbbfa8e QmlDesigner: Improve error message for invalid id
* Move the message into single place
* Improve the warning

Task-number: QDS-12195
Change-Id: I70ca89f39cf04b937336936015b2ccbf7deb98c5
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-21 08:20:06 +00:00
Thomas Hartmann
7dc52035cb QmlDesigner: Use Qt Design Studio instead of Qt Quick Designer
Change-Id: I47d66a20c95269bea1662b1d4c42509ddffe2473
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-21 08:19:42 +00:00
David Schulz
cb4f296498 Cdbext: report HRESULT as an integral data type
Fixes: QTCREATORBUG-30574
Change-Id: If877c32639c853bae9b6a5a5762f24a3954f60d5
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-21 07:32:50 +00:00
Eike Ziller
1f0afcaa76 Qmake: Do not warn if build directory is child of source dir
We changed the default build directory to be in a "build" subdirectory
of the source directory, which should not trigger this warning.

Fixes: QTCREATORBUG-30562
Change-Id: Ie9e6906602844fa08c187b92423839484a1cea92
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-03-21 07:14:26 +00:00