aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Fix crash when reparenting items into effected itemqds/v4.4.0qds/4.4Miikka Heikkinen2024-02-161-3/+5
| | | | | | | | | | | Some effect related objects such as QQuickShaderEffectSource can be silently removed alongside another object, so use QPointer to ensure all objects are still valid before readding them. Fixes: QDS-11973 Change-Id: I75ee2dc81e27774f8be87b031e149b135ec84023 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Correct import versions for Qt 5Thomas Hartmann2024-02-151-7/+7
| | | | | | Task-number: QDS-11898 Change-Id: I4e59e31f9396ab957eac5effbf17fd6edc930798 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add beta tag to the title of the Model Editor viewAli Kianian2024-02-141-1/+1
| | | | | | Change-Id: I2eff47c56928a6e49405b646ff7a98b205d9d6fe (cherry picked from commit e4fe45f237516fcce24cd77651b9493e33bf39ad) Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* GenerateQmlrc: Do not create package if user cancels the operationBurak Hancerli2024-02-142-9/+15
| | | | | | Change-Id: Ie8f2bed23d6c9b4c8496b9b75310fc8cda823088 Reviewed-by: Burak Hancerli <burak.hancerli@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlProjectManager: Cleanup cmake generatorKnud Dollereder2024-02-134-146/+167
| | | | | | | | | | | | - Consider qmlModules file like any other qml module - Use ${CMAKE_PROJECT_NAME} when possible - Break up big functions into smaller ones - Reorder arguments for tpl files Change-Id: Ie73cca8596b22adf67eba1019610a00c34976421 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>
* QmlDesigner: Close PopupDialog on QtDS inactiveHenning Gruendl2024-02-131-1/+3
| | | | | | | | | | | Close a PopupDialog whenever the main application becomes inactive by e.g. focusing another app. This prevents the PopupDialog being drawn on top of that any other application. Task-number: QDS-11870 Change-Id: I2d5dce4a7a54d43382010dedee3ba214a70d2eb8 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Doc: Fix a broken linkTeea Poldsam2024-02-132-3/+3
| | | | | | | | | Fixes: QDS-11930 Change-Id: Ide113597e9a1f3b1958946431db4fceaad41b069 Reviewed-by: Esa Törmänen <esa.tormanen@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
* QmlDesigner: Update the value of the color picker for CollectionEditorAli Kianian2024-02-131-4/+18
| | | | | | | Fixes: QDS-11796 Change-Id: Iaf3f6bc06771f461c4119d55ae3c3a294d3d8564 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* EffectComposer: Add confirmation dialog to clear all effect nodesMiikka Heikkinen2024-02-122-1/+58
| | | | | | | Fixes: QDS-11445 Change-Id: Iedd41e2799148c6d8f4eb3bca77dd5f1b7b053e6 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* EffectComposer: Fix effect preview zoomMiikka Heikkinen2024-02-122-109/+128
| | | | | | | | | | Zoom must scale the component showing the preview, not the source image. This way the effect stays consistent regardless of the zoom level. Fixes: QDS-11899 Change-Id: I550eb9ff693c24a853f5c25d9d79fa146448663f Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Insert proper value for booleans to CSV exported filesAli Kianian2024-02-121-0/+2
| | | | | | Fixes: QDS-11823 Change-Id: I4d5a73b982261f59192d7877fe682057c5181d7b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Keep the order of columns for imported jsonsAli Kianian2024-02-123-9/+77
| | | | | | | | Fixes: QDS-11670 Change-Id: Ia068bbb864065b648cffcab2c3477d3cec7f25f8 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* Doc: Update keyboard shortcutsTeea Poldsam2024-02-125-226/+608
| | | | | | | | Created separate page for QDS. Reviewed and updated shortcut list. Fixes: QDS-9499 Change-Id: I27d7dac386570c81958b8af5da2987143162aab4 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
* QmlDesigner: Reset table cell sizes after resetting CollectionDetailsAli Kianian2024-02-091-0/+9
| | | | | | | Fixes: QDS-11743 Change-Id: I7b8f0a83d796bd8094981e12032e6f0b465e2508 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* QmlDesigner: Tweak the ui of the Model EditorAli Kianian2024-02-093-22/+73
| | | | | | | | | | | | * A SplitView is used instead of GridLayout for the CollectionView * The left margin for the model items are removed Task-number: QDS-11732 Change-Id: Id66171788db1f17583147fc6f16ffd0e69ac56a5 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Remove potentially excessive values from dataStore recordsAli Kianian2024-02-091-2/+7
| | | | | | | Change-Id: Ib2606fc50662b7724ae2ba11d21264334638bec9 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* EffectComposer: Clear deleted effect if it is currently openMiikka Heikkinen2024-02-082-1/+9
| | | | | | Fixes: QDS-11787 Change-Id: Iecd177a153e88a49476dbea0241c31726d05a6a8 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Update extended View3D iconsMiikka Heikkinen2024-02-083-0/+0
| | | | | Change-Id: If1aac862a3e62e518d321e61ddf3e7c25e30efb7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Doc: Describe the Effect ComposerJohanna Vanhatapio2024-02-0813-2/+97
| | | | | | | Fixes: QDS-10528 Change-Id: I46d7ab1977acb7f0af5c0aa790de7fbf2624a449 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* QmlDesigner: Do not register Effects for item libraryMiikka Heikkinen2024-02-083-3/+8
| | | | | | | Fixes: QDS-11925 Change-Id: I981853d1c02d99cfb391209a9a7e568bf52401cf Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* QmlDesigner: Fix validation on integer spinboxesMiikka Heikkinen2024-02-081-2/+11
| | | | | | | | Now spinboxes use IntValidator if decimals is set to zero. Fixes: QDS-11922 Change-Id: Ibe8c8a18294a6764a0cd2182d09c30cdf9fb27cc Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Prioritize hiding asset_imports content in UrlChooserMiikka Heikkinen2024-02-081-5/+15
| | | | | | | | | | | | If the same file is available under asset_imports and outside it, prefer hiding the copy under asset_imports in UrlChooser when duplicate hiding is enabled. Fixes: QDS-11908 Change-Id: I06ac298e1ea45f6a94c66eb20cc4c0d4655103f4 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* QmlDesigner: Disable share button in open source versionThomas Hartmann2024-02-074-2/+35
| | | | | | | | Task-number: QDS-11627 Change-Id: I3eb21fa84b6993aa783713ef5fa3beba1e3e030e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlDesigner: Fix unchangeable data in cellsShrief Gabr2024-02-063-5/+40
| | | | | | | | | * Changes to the cell data are saved if Return or Enter keys are pressed. Task-number: QDS-11894 Change-Id: Ia3a1ff8f6c9275906736fa1e0638b81c92bea910 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* EffectComposer: Commit float and int fields on focus outMiikka Heikkinen2024-02-065-11/+11
| | | | | | | Fixes: QDS-11919 Change-Id: Id1750142d9a45b723f615d6a7da3989285f4b7aa Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* QmlDesigner: Implement effect item visibility handlingMiikka Heikkinen2024-02-066-4/+72
| | | | | | | | | | Now effects made with effect composer can be hidden/shown using visible property. Fixes: QDS-11786 Change-Id: I44782246adfa3ba3cd0a8203fa67b3f5412535f7 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlProjectManager: Add new cmake generatorKnud Dollereder2024-02-0527-2/+818
| | | | | | | | | | | Automatic cmake generation can now be enabled by setting the qmlproject property enableCMakeGeneration to true Change-Id: I98523a9479d0cd812e43a9bd0b700120358260f6 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
* QmlDesigner: Implement new data store structure for Model EditorAli Kianian2024-02-0515-685/+779
| | | | | | | | Task-number: QDS-11778 Change-Id: Ia98fee976e5d81acc608b6209da270cbee2f9c61 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* EffectComposer: Delete obsolete resource files at effect saveMiikka Heikkinen2024-02-0513-15/+109
| | | | | | | | | If a new version of same effect is saved, remove files that are no longer part of the effect from the effect import dir after the save. Fixes: QDS-11737 Change-Id: Iae4da39f9f4713c2e26f1b90263881c8c9e13d78 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Doc: Update the image for 3D modelsTeea Poldsam2024-02-053-2/+2
| | | | | | | | | | | Updated the image for 3D models and added "sphere" in description text. Task-number: QDS-11888 Change-Id: Iab917dea2baff548140751a095325494791a8bdf Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* QmlDesigner: Add extended View3D component library iconsMiikka Heikkinen2024-02-025-2/+5
| | | | | | Fixes: QDS-11811 Change-Id: I0d33311e68b302a531d3e3273d10e6f4e3ff0932 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Qml Designer: Add uniform cell size properties to layoutsBrook Cronin2024-02-023-0/+63
| | | | | | Change-Id: If2e0958c124cff259b1dbea57dd798711f0a0f1d Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Qml Designer: fix start and end angle tooltipsBrook Cronin2024-02-021-2/+2
| | | | | | Change-Id: Ic854ae254512e5f1789d558bed02f7a020558ffd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
* EffectComposer: add zoom indicatorMahmoud Badri2024-02-021-0/+29
| | | | | Change-Id: Iaedd1ec9d6f7ee169a3b69fff4a33051786653bf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* EffectComposer: Fix pan/zoom not working after adding a nodeMahmoud Badri2024-02-021-44/+44
| | | | | | | Also increase max zoom level to 3 instead of 2 Change-Id: Ia642bc65c0f902a0aff8fd81fc6f623981f2b249 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* EffectComposer: Allow 'define' properties to specify control typeMiikka Heikkinen2024-02-029-34/+108
| | | | | | | | | | | | | Control type is used to determine the control presented for the property in UI. Currently only int and bool control types are supported. Also fixed the issue that changing define wouldn't update preview. This was because changing define requires rebaking shaders, which is not normally triggered on property change. Fixes: QDS-11770 Change-Id: I953d827195565f765df1a09550c4a49da9c93c29 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* EffectComposer: Remove warnings and unused code from the modelMahmoud Badri2024-02-023-24/+7
| | | | | | Change-Id: I8171467e70d8d716b0598b0b533f216e5e0afc25 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* EffectComposer: implement interactive previewMahmoud Badri2024-02-021-5/+128
| | | | | | | | Add panning and pivotted zoom Fixes: QDS-11718 Change-Id: I516474a2ae700b8d1d486e0be96df27b3308e79d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Qml Designer: Add start and end angle properties to dialBrook Cronin2024-02-021-0/+44
| | | | | | Change-Id: I15621fef552816a018aa5adf285ad9a1261a9294 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* QmlDesigner: Disable exports not supported for MCUThomas Hartmann2024-02-015-19/+34
| | | | | | | | Add helper function getStartupBuildSystem() to avoid code duplication. Task-number: QDS-11544 Change-Id: Id8d752d63171838ac9ea6402ff9f2b179d0d8f53 Reviewed-by: Aleksei German <aleksei.german@qt.io>
* Fix typo in templateThomas Hartmann2024-02-011-1/+1
| | | | | Change-Id: Ie3e82fd1f11e3e8349ccf2df2df256aacdc8dd0d Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
* QmlDesigner: Support Qt 6.6 in wizardsThomas Hartmann2024-02-017-0/+51
| | | | | | Change-Id: Ie7baf06b9a8e7962bcd805df2ed9bf5c1066bdee Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* EffectComposer: Make spinboxes HelperWidgets.DoubleSpinBoxesMiikka Heikkinen2024-02-016-76/+74
| | | | | | | | | This way we get proper press-and-drag behavior for them. Fixes: QDS-11750 Change-Id: I039d72933b533e83ebebf0da36e5c0db81908689 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* EffectComposer: Don't reset view when switching filesMahmoud Badri2024-02-011-2/+2
| | | | | | Fixes: QDS-11713 Change-Id: Ic38d2fdf5105a5ecd623b8624fa028f6a45fe207 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Fix unresponsive RealSpinBox buttons in Number cellsShrief Gabr2024-02-011-1/+1
| | | | | | Task-number: QDS-11755 Change-Id: I53a7422642202acbea043800bd91e913b7bd0779 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Add extended 3D project templateMiikka Heikkinen2024-02-016-0/+503
| | | | | | | | | | | Extended 3D template use ExtendedSceneEnvironment instead of regular SceneEnvironment to enable various built-in effects. Fixes: QDS-11812 Change-Id: If84807f5a4dd327d6da4f08669b66ed3d7a1ff14 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* EffektComposer: Move plugin class definition to .cppTim Jenssen2024-01-313-66/+32
| | | | | | | And clean up a bit. Change-Id: Ib3d69555ed3e05741570c9aa386e6b9c8ea449fa Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: remove unused include components/effectmakerTim Jenssen2024-01-311-1/+0
| | | | | | | Change-Id: I566a686399249f51d12cdcfff04a750cbd4eeba8 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Clear text highlight when jumping to codeThomas Hartmann2024-01-311-0/+1
| | | | | | Change-Id: Ie382c2d9a45bdb57676a4c047bf750b0b7849191 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* QmlDesigner: Remove unused codeThomas Hartmann2024-01-311-54/+0
| | | | | | | | Change-Id: I56a72af9251a1908f160c0e92b56addf69143169 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>