Commit Graph

68765 Commits

Author SHA1 Message Date
hjk
cfa88ac169 QmlJS: Avoid deprecation warning
de18b3ff370543b5b99bd068b871a2cd677cf9f3 deprecated the
QCryptographicHash::addData(const char *data, qsizetype length)
overload.

Change-Id: I86444a9d7de3cafc596f508fc08c3a4c1f25142f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-06 07:45:27 +00:00
hjk
82966bc7ba Revert "ProjectExplorer: Remove 4.11 compatibility code in buildsteplist"
This reverts commit c8e1333f89.

Contrary to the comment in the code this is apparently still in active
use in the user file accessor.

Change-Id: I5e5dddbe2a95c70bda92ce732688041787145055
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 07:14:41 +00:00
Marcus Tillmanns
7b3c2c13a1 Terminal: Decode percent encoding
Fixes: QTCREATORBUG-29254
Change-Id: I0d1712753f488dff9252d2fcf099c9aefb06ed0b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 06:43:36 +00:00
hjk
ebc185b1bb QmlProjectManager: Use FilePathAspect for device QML viewer overide
Cosmetical.

Change-Id: I480fd3163b45c3b2a19b7636cb79d6cb9b166825
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-06 06:43:04 +00:00
Jarek Kobus
b7bd30aeb8 Tasking: Introduce ConcurrentCall
It substitutes Utils::Async, but is Utils independent.

The ConcurrentCall class is prepared to work with TaskTree.
Provide the task tree adapter for the ConcurrentCall class.
Register the task inside the Tasking namespace under
the ConcurrentCallTask name.

This class introduces the dependency to Qt::Concurrent,
otherwise Tasking namespace is independent on Qt::Concurrent.
Possibly, may be added into Qt::Concurrent lib,
as a wrapper around the QtConcurrent::run() call.

Change-Id: I4511ff0430e78346aa6a4fae1a9d5370fdd08506
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 06:35:45 +00:00
Marcus Tillmanns
8d02d96127 Terminal: Fix esc button update
Change-Id: I4862de654ab920faa46742b4a4433dff07ed0387
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 04:37:59 +00:00
Thomas Hartmann
cc67fe2897 QmlDesigner: Take '.' properties into account in convertToVariant
What we call dot properties have two styles.

something.x

something {
 x: ...
}

In the second case the prefix is set, because in the model we always
normalize the syntax to the first case.

toString() properly walks the array to collect the full identifier, instead of just taking the base property name.

Before we were using e.g. 'eulerRotation' as the property type and tried to convert a single float to a vector3D. The new code uses thefull property name 'eulerRoation.x' and the conversion succeeds.

Task-number: QDS-10027
Change-Id: I7210558db6a0f91f5f1a25b719df06beb70c5b83
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-06-05 12:39:03 +00:00
Jarek Kobus
b14c07eed6 TextEditor: Reuse qScopeGuard instead of ExecuteOnDestruction
Change-Id: I2ca7d4676bb4f34fbf59fd45bcd01d7857cb7e4e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-05 08:35:14 +00:00
Jarek Kobus
e376355b18 CorePlugin: Reuse qScopeGuard instead of ExecuteOnDestruction
Change-Id: I2b6f6319d82512fec9a407649d7514f93283770d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-05 08:17:49 +00:00
Christian Stenger
8b3f246285 AutoTest: Tweak postponing parse once more
Postpone the parsing also if the build system is waiting
for a parse.

Change-Id: I56aaecfca05ea28a21c13747847b518d1eb8732f
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-05 08:02:11 +00:00
Christian Stenger
980a95f7d6 TextEditor: Fix missing include
Amends 8da3575d72.

Change-Id: I5696d83731cd25cc3abc58d7dc5359859918ac8e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-05 07:40:48 +00:00
Orgad Shaneh
e92a131644 Terminal: Fix MSVC warning
warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data

Change-Id: I5d57843eba79f0eb023ea7e3c4149aa515430189
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-05 07:33:46 +00:00
David Schulz
c2d008a322 ClangFormat: use fromUserInput to prevent asserts
Change-Id: I9f33c8e8ef276d771d727a6678cf72e80e7d46d9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-05 05:44:43 +00:00
Samuel Ghinet
616c53d0e6 QmlDesigner: Make textures updatable
Fetch the new textures from the remote server

Also, disabled tst_qml_wizard, for now.

Task-number: QDS-9607
Change-Id: I35081b90afadddff8d8c4b32da8bed82996304cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-02 19:46:33 +00:00
Tim Jenssen
002d84cb15 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts: src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
  src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
  tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
  tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp

Change-Id: I257f1908917bcc58805619b53b6866f2f73ca544
2023-06-02 19:26:05 +00:00
Brook Cronin
bc64870688 QmlDesigner: Add new icons for content updates
Change-Id: Id5f1694eb301157cad3e67bd576df184527dd6a1
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-02 16:41:31 +00:00
Thomas Hartmann
c716056cbc QmlDesigner: Allow transitions also for bindings
Task-number: QDS-10019
Change-Id: Ib7003047241fde3838b248d1fc90161725cb94f9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-02 15:10:20 +00:00
Thomas Hartmann
602e08dbee QmlDesigner: Fix issue with duration tracking
An event can start and end duration tracking at the same time.

Task-number: QDS-9961
Change-Id: I97265f753887e87ef5bdb9b4bc93ca97922a51d4
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-02 14:50:12 +00:00
Aleksei German
3c36e77858 QmlDesigner: Fix some escape characters
Task-number: QDS-9415
Change-Id: I6459451d0f7699c727b2e0baad726f5c6af2ca74
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-02 13:32:03 +00:00
Alessandro Portale
e759ce310f Core: Use LayoutBuilder in PluginDialog
Change-Id: I06b07234727fc46a717af89febae43af1cb67b9b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-02 12:46:40 +00:00
Miikka Heikkinen
d9cc2dc8c5 ProjectExplorer: Fix check for "Kits" page hiding
Fixes: QDS-9231
Change-Id: I53fc333fca2ec81edcb2b254a98613309e8335a9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-02 12:41:26 +00:00
hjk
5bacd9328e Utils: Add a overload taking a AspecContainer for TextDisplay
Change-Id: If6cc933e852b80c4ec6abcc2477db8852392ca69
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-02 11:58:54 +00:00
hjk
c8e1333f89 ProjectExplorer: Remove 4.11 compatibility code in buildsteplist
Change-Id: Id0e65f17dcd4697e3c4d1f828a564b495e114ee4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-02 11:58:42 +00:00
hjk
5986270232 QMakeProjectManager: Remove compatibility reading
For versions less then 4.12 (2019).

Change-Id: I566189eafe6deb1ed29b2e004a38cdd4295ea9b0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-02 11:58:24 +00:00
Jarek Kobus
f10581ee31 GitGrep: Reuse searchInProcessOutput()
Change-Id: I5e97f23c0e2a06ccd3d204977ac1abc986b84e5c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-02 11:51:29 +00:00
Jarek Kobus
64d209c24b SilverSearcher: Reuse searchInProcessOutput()
Change-Id: Ifc28a88c7bd0de94ea78c5f3eaaa2179b0aee600
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-02 11:51:08 +00:00
Jarek Kobus
8da3575d72 BaseFileFind: Introduce searchInProcessOutput()
To be used by SilverSearcher and GitGrep.

Change-Id: I16a5fa18a90e6c895658ebc9dd8fd209235e17d3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-02 11:50:29 +00:00
Jarek Kobus
7b2c1fdab0 GitGrep: Make pause and continue working
Make cancel and continue button working. Make pausing
above 200000 hits working.

Applied the same pattern as it was done recently inside
SilverSearcher: cd70d10dce.

Change-Id: I5e466e2176a59301dbfd3f957012e1760bd0c20f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-02 11:50:22 +00:00
Jarek Kobus
7a42c32732 SilverSearcher: Fix quitting the loop after resume
Quit the loop after resuming when the process already finished.

Amends cd70d10dce

Change-Id: I73d4b11bb2be47ce9cc6c6c816b60058bc2db250
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-02 11:50:11 +00:00
Aleksei German
a13de9a5fd QmlDesigner: Fix a typo in deescape function
Change-Id: I2f474fdaaee8b556a5a91b61bf3025d9f6d480fb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-02 11:28:23 +00:00
Miikka Heikkinen
85739119af QmlDesigner: Don't allow add QtQuick3D import for MCU project
Don't show the normal onboarding label on 3D view if current project
is a MCU project that doesn't support QtQuick3D.

Fixes: QDS-10012
Change-Id: Iaa309efac3a5b2c0f2fce2e5e96c9012eaf6750d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-02 11:27:27 +00:00
Orgad Shaneh
a5dfbe01d5 Utils: Support hardlink detection also on Windows
Change-Id: I717899ef73e965438ecd28983397ffc90a7ff570
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-02 11:25:54 +00:00
Eike Ziller
04c2a32fc0 ExamplesParser: Export only for tests
Makes binary compatible changes easier later, if needed

Change-Id: Ib3e04ac3a26068cf9f8bcc57b2dad9d0aeaaa5c3
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-06-02 11:22:41 +00:00
Christian Stenger
d9e3d32a80 MarkdownEditor: Ensure focus is inside the editor part
When loading a file it is more likely that the editable view
of the document should be focused than the read only part.

Change-Id: I8b7ed40a233dedf94883072be7462ebeabb78b42
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-02 10:42:02 +00:00
Christian Kandeler
d65273aee3 Update qbs submodule to HEAD of 2.1 branch
Change-Id: I3d670f8192f79806161fd7871fa9e5ff8c398f22
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-06-02 09:55:43 +00:00
David Schulz
68a5cd6575 LanguageClient: postpone creating progressbars
Some language servers are spawning progress reports for many small
tasks. This can get distracting in the case where those progress bars
are spawned while typing, like in the case of the python language server
that creates a report for every lint that gets triggered after receiving
a document change notification. So in order to reduce the amount of
progress bars created from progress reports we postpone the creation of
the bars.

Fixes: QTCREATORBUG-29224
Change-Id: I2e658be0a26b21e41c80b444184648ba70682522
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-02 09:03:02 +00:00
Yasser Grimes
f146bebbc7 McuSupport: Simplify template integration
To simplify how users integrate their projects with Qul, Qul related
template files are placed under the "qmlproject" subfolder.

Task-number: QTCREATORBUG-29114
Change-Id: I984f1619547951e0518790c843987f03b7daa62a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-02 08:32:22 +00:00
Miikka Heikkinen
8654afc4d6 QmlDesigner: Force manual lights baking mode if unexpected properties
If unexpected property values are encountered during lights baking
setup dialog population, e.g. binding property is used for a property
when variant property is expected, we automatically set the manual
baking mode.

Fixes: QDS-10009
Change-Id: Iee25ed5ae9699f4efb70d2b8b57dea451cab5dce
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-02 07:33:59 +00:00
David Schulz
270972c7bb ClangCodeModel: report highlight results in one batch again
... with Qt 6.6

Change-Id: Ic3ebb5cee4deeebf87a0d8e0ab33bcdc1c92c3a2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-02 05:37:50 +00:00
Henning Gruendl
65600c8805 QmlDesigner: Fix EditableListView
- Fix ComboBox value not cleared after last material removed
- Add ListValidator
- Use ListValidator for the EditableListView in order to properly check
  for acceptable input in regards to textRole and valueRole

Task-number: QDS-9645
Task-number: QDS-9891
Task-number: QDS-9896
Change-Id: Ia3ebad1f8080a4a4ef6bd0da6a72e335d1e76643
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-01 22:20:02 +00:00
Thomas Hartmann
621df696d4 QmlDesigner: Add support to trace two following events
By calling registerCombinedTracedPoints we collect the duration
between EVENT_STATE_ADDED and EVENT_STATE_CLONED.
If EVENT_STATE_CLONED. follows after EVENT_STATE_ADDED in less than
10 seconds we emit EVENT_STATE_ADDED_AND_CLONED togehter with
the actual duration between the events.

Task-number: QDS-9961
Change-Id: If23b7dfa4e34bd533492b78f066dcb7518c2563e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-01 18:42:50 +00:00
Jarek Kobus
738d13cd43 GitGrep: Use QStringView for parsing
This speeds up the parsing of big results (~2 million hits)
by ~5-10%.

Remove PromiseType alias.

Make regexp a member field and configure it just once inside c'tor.

Change-Id: Ib99597a7b8b979d49f36f2c7d146beeaa1caa380
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-01 17:00:16 +00:00
Thomas Hartmann
547f719631 QmlProject: Add trace point to qmlproject
We use the qmldesignerplugin, if the qmldesigner plugin
is disabled then nothing is traced.

Task-number: QDS-10010
Change-Id: Ifa7f7719efca6a757e69b75937368d7a69a5e460
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-01 16:46:58 +00:00
Thomas Hartmann
a687af8324 QmlDesigner: Unify and fix property comparison
So far string and QString were not considered equal.
Unifying the type comparison.

Task-number: QDS-9938
Change-Id: Ia64fee9b56b8cf916669aca1d3f09a3f05ecf29f
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-06-01 16:44:50 +00:00
Jarek Kobus
71d492ae13 GitGrep: Use the text editor font for the results
This looks more consistent with the results reported by the internal engine.

Change-Id: I7a83954d230a61bb6db380d28de32ebde95ad366
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-01 16:36:07 +00:00
hjk
03485af139 Autotools: Self-register aspect in AutogenStep
Change-Id: I130ec25e6bf0bb6a45de7325834b8cc19f8c86e7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-01 16:19:11 +00:00
hjk
db4dd91caf FakeVim: Streamline settings handling a bit
Change-Id: I6ab2c1643a5236525515ded296cd854933584603
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-01 15:33:59 +00:00
hjk
629e6ab945 Use a few more explicit FilePathAspects
Change-Id: I97431306754af3ea7a803021db7b876c31abc940
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-01 15:33:47 +00:00
Christian Kandeler
fd7cb1181f Tasking: Fix qbs build
Change-Id: I0ad1232a997a98902e6e9a7972f2af8e04a6b096
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-01 14:52:58 +00:00
Jarek Kobus
cd70d10dce SilverSearcher: Don't crash on giant output from ag
Make cancel and continue button working. Make pausing
above 200000 hits working.

Fixes: QTCREATORBUG-29130
Change-Id: I55429ae1b4d80dacfcd7e8366133657d0c44a0d6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-01 14:46:20 +00:00