Commit Graph

68765 Commits

Author SHA1 Message Date
Miikka Heikkinen
77678c7bce EffectMaker: Add clear all nodes button
Fixes: QDS-11335
Change-Id: I5d0e0e11baabe780c19234410814a9f6eb45130d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-21 11:36:23 +00:00
Henning Gruendl
659772baa4 QmlDesigner: Fix navigator column width
Fix the navigators column width for Qt 6.5.4 and at the same time make
the icon columns tighter.

Task-number: QDS-11314
Change-Id: I87397eca104e4bfb835090229672e2d3d42dee6e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-21 10:28:27 +00:00
Tor Arne Vestbø
4f9cf826d6 Detect iOS 17 device development status via devicectl
iOS 17 devices no longer report the development status via
the com.apple.xcode.developerdomain domain.

Task-number: QTCREATORBUG-29682
Change-Id: I9de3c88425b71906f51d0f0e8b6a4ece0e08eb3a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 09:55:55 +00:00
Ali Kianian
54c9a38baa QmlDesigner: Fix the build error for CollectionImportTools
Change-Id: I946df14af3e4425203ea7ea04807205442c3119d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-21 09:54:10 +00:00
Mahmoud Badri
b14037f537 QmlDesigner: Add clearList icon to icon font
Change-Id: Ib60120dccca106e723d7eb2fe21ef574de62605a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-21 09:04:46 +00:00
Christian Stenger
3fdea38f58 EmacsKeys: Use SPDX License header
Change-Id: Ief2367d0d7cfae8e20b29b511bd87db348051b4d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 08:46:38 +00:00
hjk
72cdbbb8da ProjectExplorer: Check for accidentally deleted workers
... before checking for re-run support.

The workers are own by the RunControl, they should not self-destruct,
but this apparently happens.

Change-Id: I41101dfc20bf2ff4f19c440934e4d4010a88c04e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-21 07:58:37 +00:00
hjk
b86ca0947b QmlPreview: Fix double deletion of RefreshTranslationWorker
The RunControl takes ownership of its RunWorkers.

Change-Id: I720d4404f991651de5d5f7906fbea96f0e4e20ba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-21 07:11:41 +00:00
Ali Kianian
96ddb5da8b QmlDesigner: Remove the options from adding model dialog
Task-number: QDS-11234
Change-Id: I064d2fed81a8f2592cfefae2c603b2d790b6bfb3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 15:08:59 +00:00
Ali Kianian
9a55e5c3de QmlDesigner: Import a model to the default JSON model group
Task-number: QDS-11312
Change-Id: Ib97273a15db4c7fb46ed01debf99602b71ec7630
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 15:08:52 +00:00
Ali Kianian
16e06a0af0 QmlDesigner: Move the action for adding a collection to json
The action should be moved to the tool menu of the Json Collection

Task-number: QDS-11256
Change-Id: Ieb2c9cc4f4b992f1ac3225bbbd90e3d14afdc711
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 15:08:42 +00:00
Ali Kianian
42405ffa74 QmlDesigner: Fix the bug for saving collection
- The node resolved path was wrong.
- Also the saving method is cleaned up.

Change-Id: Ic905c20e5899fcc23c97a8d42a1fdf7c0c8e1089
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 15:08:33 +00:00
Ali Kianian
a5a1152a76 QmlDesigner: Support having diffrent url types by the collection editor
Task-number: QDS-11222
Change-Id: I94aac8a6cc5eb86d338b02a24886388188dc5def
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 14:56:51 +00:00
Miikka Heikkinen
af656a3b53 EffectMaker: Fix copying asset files during export
Fixes: QDS-11290
Change-Id: I54d7f618bcf1bed44d105ceb4e48fd6820d6b6ea
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 14:52:04 +00:00
Ali Kianian
414649e385 QmlDesigner: Remove the export popup
Task-number: QDS-11242
Change-Id: I3ef24a41e58162eeb34fcf0f220d5854410fbb73
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>
2023-11-20 14:51:39 +00:00
Miikka Heikkinen
38205996af EffectMaker: Add the default image to UrlChooser combo for image values
Fixes: QDS-11221
Change-Id: Ib788c6950c9fc59fd87e199ab6c54bdd274cc8a2
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-11-20 14:51:02 +00:00
Mahmoud Badri
e740bc076c EffectMaker: Load effect nodes from share folder
Change-Id: Ie7b1c95d6eb277c01310d9badc1b755e0517385c
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-20 13:46:04 +00:00
David Schulz
d81d41032a TextEditor: do not collapse doc comments in the beginning of a file
The auto fold license header functionality also automatically folds
documentation comments. Automatically collapsing documentation comments
is never correct in the first place so just skip the fold when encounter
a documentation marker in the first comment.

Fixes: QTCREATORBUG-29900
Change-Id: If0dd7842804f3ff0bcd725b54413e9568d5b5ab3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-20 13:39:30 +00:00
David Schulz
b451019be1 Android: enable "Toggle Comment Selection" shortcut in manifest editor
Fixes: QTCREATORBUG-29818
Change-Id: I8434ea99d8f5c5dc3c0436f5313d42084aca4152
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-20 13:27:13 +00:00
Christian Stenger
c5980a4872 CMakePM: Fix build
Avoid ambigous conversion, instead explicitly convert.

Change-Id: I1b62a8eb94cc2c353b33ec1a29a28385fdb92782
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-20 10:19:53 +00:00
Miikka Heikkinen
a2b195580b EffectMaker: Fix popup geometry
Effect Maker preview and node combo box popups will now stay within
the screen boundaries of the screen the parent combo box belongs to.

Fixes: QDS-10512
Change-Id: Ibbfb706499c4b17e27ff5ae471fef8bb9f7384cb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 09:41:13 +00:00
Cristian Adam
48a3a12b01 CMakePM: Add failure logging for add|rename|removeFiles
Task-number: QTCREATORBUG-29914
Change-Id: I404a3efb8cabafba6036eb1bc07d19f18af17cd8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-17 21:09:31 +00:00
Thomas Hartmann
48c1d9466c QmlDesigner: Use QML/Designer/UseExperimentalFeatures44 for EffectMaker
Change-Id: I233d1b39cc336beb18a837cbba26605528876e63
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-17 18:09:56 +00:00
Thomas Hartmann
c09635e850 QmlDesigner: Use QML/Designer/UseExperimentalFeatures44 for ModelView
Change-Id: I4de7c2c0b64cbdda65d5258168b72fe13f6dbd07
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-17 18:09:34 +00:00
Aleksei German
9a8fa56a66 QmlDesigner: Fix for Style ComboBox
Task-number: QDS-11257
Change-Id: Ie50b9f585914c8f6345d61a8e6c5347998b3fc63
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-17 15:10:18 +00:00
Christian Stenger
f06b821f58 AutoTest: Fix handling of critical messages
Fixes handling of qCritical() messages or similar and
silences a soft assert.

Change-Id: I74f485ffd75b65170c2c9752bd774401c0f19734
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-17 12:55:43 +00:00
Thomas Hartmann
8932f9d462 QmlDesigner: Add try/catch block
There seem to be rare cases in which this fails.

Change-Id: I229a9a72394ec25dca1a9cdae0b51aa36291be94
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-17 12:54:47 +00:00
Christian Kandeler
d05d6f2469 Update qbs submodule to HEAD of 2.2 branch
Change-Id: I56bfc87909d6b73b90243371c30138be9fcff6ca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-17 12:35:54 +00:00
Amr Essam
901b356ea5 EffectMaker: Fix incorrect QML parsed values
Task-number: QDS-11296
Change-Id: I97d725271e61d4e14db23382ff7398353ced845d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-17 10:45:25 +00:00
David Schulz
fbf8b4d3c3 Copilot: fix applying copilot suggestions word by word
via the ctrl+right shortcut

Change-Id: I1a9460a456833c7ddd35a42a63eaf75b8e2930b3
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2023-11-17 06:48:39 +00:00
David Schulz
cff26d813a Clangd: Avoid client restart after modifying open documents
Change-Id: I116eed1b047159e3d1ce64f18f44da6a0ad7b231
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-17 05:38:13 +00:00
Henning Gruendl
c3f9d43aca QmlDesigner: Fix PopupDialog popup location
* Restrict popup location to single screen given by global position
* Reintroduce PopupDialog title bar drag
* Fix global popup show on linux

Change-Id: If1923151cb9d0ec4286f27aeae2baa292e017eb5
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-16 17:57:28 +00:00
Cristian Adam
7affb80fc3 CMakePM: Do not show source/group/path twice
For the cases of:
  source_group(TREE ${CMAKE_SOURCE_DIR} FILES my/subdir/file.cpp)

Treat the "my\\subdir" part in the project view as part of the source
group name.

Fixes: QTCREATORBUG-29799
Change-Id: I92bf581be25d085783bcdadd8a418b849a29c708
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-16 16:39:38 +00:00
Karim Abdelrahman
eb45df8349 McuSupport: disable run button while flashing in progress
Mcus run configuration will build and flash the binary
into the target board. The flash process could go wrong
if the user accidentally restarted the flashing process
by clicking the run button again while flashing is already
in progress.

Task-number: QTMCU-104
Change-Id: I1387bfd1dd299d427af13de5904f5ad3a8a1d347
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-16 15:37:00 +00:00
The Qt Project
245bd90a6e Merge "Merge remote-tracking branch 'origin/12.0' into qds/dev" into qds/dev 2023-11-16 15:03:44 +00:00
Tim Jenssen
39d1dae0d3 Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: Ic6e557806a3209e2c6d983d3c3fcfad66f6e3066
2023-11-16 15:56:06 +01:00
Thomas Hartmann
be757e49f4 QmlDesigner: Add back empty entry to ordered properties
The empty entry defines where default properties and signals
end up.

Change-Id: I9a17dbbe80374e45e78318608c67a213441aef4f
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-16 14:54:07 +00:00
Knud Dollereder
171bb13aec QmlDesigner: Fix Formeditors override size behavior
- Set override size only if it differs from the actual size.
- Remove override size auxiliary data when the model gets detached.
- Remember the size when the user sets it explicitly and use that
  as default size from now on.
- Make sure that the rootItemRect is correctly set when the override
  size auxiliary data changes.

Fixes: QDS-11078
Change-Id: Iaedf076a5c21658478fe257e9f6caca78d6d1461
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-16 14:48:17 +00:00
David Schulz
5e0c97a38e LanguageClient: fix restarting language servers
A timer is used to ensure a server shuts down after a certain amount of
time. This timer needs to be reset after restarting the client
otherwise the client gets forcefully deleted after the timeout.

Change-Id: I804678ec9491328e3da11fd0f9faa59f6e5f7d92
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-16 13:54:48 +00:00
Miikka Heikkinen
458d44fdc5 EffectMaker: Fix image path in generated effect qml
Fixes: QDS-11293
Change-Id: I687e3038aa9a92c61955eda4532c2b672c2d6c4d
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-16 13:20:55 +00:00
David Schulz
b960fb4481 Editor: centrally emit filesChangedInternally after refactorings
...instead of relying on the surrounding code of the refactoring to emit the signal.
This also ensures that the signal is only emitted for files that are not opened inside
a TextEditor.

Change-Id: I6223362864014c691962d895b864f9f44c36e035
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-16 12:05:13 +00:00
Mahmoud Badri
68be6228db QmlDesigner: Icon font updates
Added:
- deletepermanently_medium.svg
- alphabetical_medium.svg
- assignTo_medium.svg
- comboBox_medium.svg
- createObject_medium.svg
- recent_medium.svg

Modified:
- addcolumnleft_medium.svg
- addcolumnright_medium.svg
- addrowabove_medium.svg
- addrowbelow_medium.svg
- deletecolumn_medium.svg
- deleterow_medium.svg
- export_medium.svg
- import_medium.svg
- tableView_medium.svg

Removed:
- downloadcsv_large.svg
- downloadcsv_medium.svg
- downloadjson_large.svg
- downloadjson_medium.svg
- uploadcsv_large.svg
- uploadcsv_medium.svg
- uploadjson_large.svg
- uploadjson_medium.svg

Change-Id: Ib5fb5ee5dfb3224ad99ee895d83a8910a5cc18c5
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-16 11:02:04 +00:00
Thomas Hartmann
9958987be7 QmlDesigner: Allow QtQuick 6.6 import
Change-Id: I5f16c6dbd96a22fba540a3877c7eb3ebf2b61734
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-15 16:32:43 +00:00
Amr Essam
306ce4ab35 EffectMaker: Open saved compositions
- Also fixing issues related to image paths
- Composition name is shown in save dialog when re-save
- Clear current composition for reset or open a new one

Task-number: QDS-11192
Change-Id: I97aad4b5216e6b116343bb274db0f9abd1275fec
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-15 14:29:52 +00:00
Marcus Tillmanns
7819fc5dfb Terminal: Only unlock exit on macOS
Fixes: QTCREATORBUG-29902
Change-Id: Ifbb1f12c874f2f68483a34ac6e117214211e5be4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-15 14:13:48 +00:00
Karim Abdelrahman
de4c871655 QmlDesigner: Fix isQtForMcusProject() bad if condition
"if(activeTarget && activeTarget->kit())" will always
return true for both Qml & CMake build systems.

The value of McuSupport.McuTargetKitVersion has to
also be checked as the third condition for Cmake
build system.

Task-number: QDS-10599
Change-Id: I5904e34082d1d81cccc4dd43b6911f9160eb5ea1
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-11-15 13:50:35 +00:00
Aleksei German
5b90cbc29a QmlDesigner: Disable State Groups for Qt for MCUs
Task-number: QDS-10355
Change-Id: I1b26b8e5b9ef3ed3176b7d6cd34bc1e27879ce1c
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-15 10:40:45 +00:00
Thomas Hartmann
f199755cfe QmlDesigner: Adjust display strings for jump to code
Change-Id: Ia1f976491be0834ce936092429ebceee360be2df
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2023-11-15 10:11:20 +00:00
Thomas Hartmann
c1edcc5d9f QmlDesigner: Do not allow invalid imports
For example: import QtQuick '-1.-1'

Change-Id: Ia63be5471f4fa69b7f798876239fb57db7806f91
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-14 20:16:51 +00:00
Eike Ziller
206000a3d6 Fix state of LineColumButton after clicking
When using the `pressed` signal, the button stays in the "pressed" state
forever afterwards. Using the `clicked` signal behaves correctly, so use
that instead.

Change-Id: I646c93f1db3b1176630f1cfa718aba01d0aaf252
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-14 13:38:04 +00:00