Commit Graph

84431 Commits

Author SHA1 Message Date
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
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
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
Ali Kianian
95dfd52712 QmlDesigner: Fix the delete dialog size problem for CollectionEditor
Task-number: QDS-11284
Change-Id: Iba60a27b0037c7db4270603f22855fac4a9c1d05
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-16 11:09:22 +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
b7657a8d23 QmlDesigner: Add source property to MediaPlayer
Change-Id: Ie70e6f8c0e8d3ac316b98bc43f3cb7baecbb9d1b
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-11-15 16:57:00 +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
Esa Törmänen
031e23edbe Doc: Update QDS version compatibility with Qt for MCUs SDKs
Modified the QDS version compatibility with Qt for MCUs SDKs page
so that it's up to date with the latest/upcoming releases
(Qt for MCUs 2.6 & QDS 4.4).

Task-number: QDS-11228
Change-Id: I21ca6e5e7362c8bab756d1adcd81954deea48784
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Maija Metso <maija.metso@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@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 13:09:26 +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
Eike Ziller
90e6fb54b6 COIN: Update to Qt 6.6 provisioning
That Qt version is used for building as well

Change-Id: Idae06324532b0dc2f453b802ca3d817fe3d41593
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-11-15 07:10:35 +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
Henning Gruendl
6239b079f8 QmlDesigner: Fix insight view sections
Task-number: QDS-11220
Change-Id: I97471ccc3362617b7f1613c77e5cc86ae81d7e15
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-14 14:54:41 +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
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
Miikka Heikkinen
5831368fab EffectMaker: Don't show plain preview image when there is an effect
Plain preview image shows through transparent parts of the final
effect image, so hide the original image when there is an effect.

This fixes opacity mask effect preview.

Fixes: QDS-11219
Change-Id: Ib726a6136182090fba7a3680680e998c039a497b
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-13 15:34:24 +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
Leena Miettinen
1541a486c1 Doc: Fix double "the"
Change-Id: Ibffeb5da3dd7dda3b8886bf909ecd97bf3b06d83
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-13 11:08:51 +00:00
Leena Miettinen
35f8f069ad Doc: Fix "the the"
Change-Id: Ib39bc4dddc75a10dedff6006283d1258415d679b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-13 11:07:49 +00:00
Leena Miettinen
eb9c2da726 Doc: Turn Managing Sessions into a how-to topic
Task-number: QTCREATORBUG-29361
Change-Id: If15556fdcb5d365b65f1f56a77ab9c21739d0854
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-13 09:05:07 +00:00
Eike Ziller
702f4393f9 Bump version to 12.0.0
Change-Id: I47191ac3dcbfbde7f39bf2d322f8db488648aa35
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-13 08:40:38 +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
Ali Kianian
1914b12317 QmlDesigner: Polish the Collection Editor ui
Task-number: QDS-10621
Change-Id: I0d9655888538bee8c759b6bf2c93eb5dc2455856
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-10 17:45:25 +00:00