aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: QDir -> FilePath to get a saver removeRecursivelyqds/4.3.2Tim Jenssen2023-12-211-1/+1
| | | | | Change-Id: I89bf782e8e6e119de44ee4540e8d2ab7dbef738c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Utils: add more removeRecursively checksTim Jenssen2023-12-211-9/+40
| | | | | Change-Id: I0b8bbe99132157cc5a73355c9b396201ec259aaa Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add checks against deleting filesThomas Hartmann2023-12-211-7/+11
| | | | | | | | | There were reported cases in which the documents folder was deleted. Adding checks to ensure only temporary files are deleted or single examples. Task-number: QDS-11545 Change-Id: I93257ca6a9898ea6844cbc4125daef28ea57a7e7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: fix crash on exitTim Jenssen2023-12-212-5/+6
| | | | | | | | | None QObjects are not children of something - so they need to get tracked. Task-number: QDS-11555 Change-Id: I866097f9553a6080b30f0c12362bf7ec66321c05 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix the bug for showing focused widget-based scrollbarsqds/4.3.3Ali Kianian2023-12-071-2/+10
| | | | | | | | | Fixes: QDS-11474 Change-Id: Ibfc156893812ab7a541fe01e995fe528a1d80d2f Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> (cherry picked from commit bb690b4ccc425dc1fa160356a4b53bb8e4d620d9) Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Polish the ui of the Model EditorAli Kianian2023-12-073-14/+18
| | | | | | | | | | | | | | | | - The main toolbar of the Model editor is aligned with the rest of the ui - Update/Save icon is updated - Tooltips for save and export actions are modified - Minimum size for the Model editor is applied Fixes: QDS-11449 Fixes: QDS-11244 Change-Id: Ice389ae439ac855eb3a5d3197a2365e6d2506a90 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> (cherry picked from commit f7ecfedba0381cf3362f8e95ab74c14552d4d99c) Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix the bug for importing json fileAli Kianian2023-12-071-2/+10
| | | | | | | | | | | | | | - Json objects are considered valid in the json arrays. - Json arrays are removed from the row objects. Fixes: QDS-11472 Change-Id: I89d7fb6d12952a994cf5e3aab0869154a3ab5d27 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Shrief Gabr <shrief.gabr@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> (cherry picked from commit 8f6e90783c52d0ba26b902876375efd547c2314b) Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Remove the collection source item from the uiAli Kianian2023-12-074-446/+33
| | | | | | | | | | | | - Collection Source Model item is removed from the ui - Collection items are realigned Task-number: QDS-11416 Change-Id: Ia185907dec9221494c3551a3a679886910f9cfeb Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 85e8f7e998fbf9e2aade3035857fb2d2bb573676) Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add DataStore Dynamically to the projectAli Kianian2023-12-077-34/+166
| | | | | | | | | Task-number: QDS-11400 Change-Id: I0ad20a6aad604aa66d4d0f24ca32a19fb9e94a08 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> (cherry picked from commit 4129c7703b0f51ea523b8dda72dc384e4a3cbcf7) Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add save icon to the icon fontMahmoud Badri2023-12-073-92/+94
| | | | | | | | | Change-Id: Ic88f61f19142a42cc456cb85f836ea9ed5635c07 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Ali Kianian <ali.kianian@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 1423740e09efdacb997f0236020062eea6372e1e) Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Assign a single collection model to the selected nodeAli Kianian2023-12-077-27/+54
| | | | | | | | | | Task-number: QDS-11217 Change-Id: I35eb536540faa2299a51d152a29f07c2c36abe41 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> (cherry picked from commit 206ad75359ea319cde531aebcee9d317c26cead8) Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* EffectMaker: Hide properties that use custom valueMiikka Heikkinen2023-12-064-0/+5
| | | | | | | | | These properties would require custom editor, so hide them for now. Typically there is no need to change these values from defaults. Fixes: QDS-11419 Change-Id: Ia91d48f5df86885420dccef47ed024af4cc8f430 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* StudioWelcome: Fix help url for getting startedThomas Hartmann2023-12-051-1/+2
| | | | | | Task-number: QDS-9780 Change-Id: I32a3f5782cda1611ce12588873ac6f45620adf52 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix for Basic Controls styleAleksei German2023-12-051-1/+1
| | | | | | Task-number: QDS-10980 Change-Id: Ia50bbe602dc54b5684c1ee432052e8c33559ef7f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesginer: lets release Qt Design Studio 4.3.2Tim Jenßen2023-12-041-3/+3
| | | | | Change-Id: I3cb1a0312904bcdb891ffaf312c678116d1a04d1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix content library license checkMiikka Heikkinen2023-12-041-10/+3
| | | | | | Fixes: QDS-9680 Change-Id: I96a85bba779f373144fb04b4ede4b39f898957e6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix ColorPicker EyeDropperHenning Gruendl2023-12-015-23/+62
| | | | | | | | | Task-number: QDS-11451 Change-Id: I8889e0475647bec480757652b84a5751642a6a07 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> (cherry picked from commit 839152177a7ba4eaa4fdf5e23e327130a8a92803)
* QmlDesigner: Fix UrlChooser tooltip binding loopHenning Gruendl2023-12-011-126/+127
| | | | | | | | | Task-number: QDS-11454 Change-Id: I519df644b4a034bcb103eeecc8bbf52504a9036d Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit 71310992d95ce28b17ece559687db0c36afd6196)
* QmlDesigner: Fix property name for SectionLabelHenning Gruendl2023-12-011-2/+2
| | | | | | | | | Task-number: QDS-11469 Change-Id: I7b7d772792fe79d6d3ccc34e8a58c92a018cca6e Reviewed-by: Ali Kianian <ali.kianian@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> (cherry picked from commit 83b4d952b78b0305c920b90f8f808bd654c43b2a)
* QmlDesigner: Cleanup the templates for DataStoreAli Kianian2023-12-0115-72/+36
| | | | | | | | | | | | | | - Fix the bug which disables the live preview - The singleton of the DataStore is defined once - Also modifies the template file formats of the DataStore files Fixes: QDS-11430 Change-Id: I67e0f64355dccdc32c031bb4dc0fb8edf3fdf64a Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> (cherry picked from commit 37cca63593fac4aff95e3f08a738451a81b87e20) Reviewed-by: Ali Kianian <ali.kianian@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Hide categories in Qt Insight viewHenning Gruendl2023-11-302-2/+4
| | | | | | | | | | | | | | | The configuration file of Qt Insight changed its form which means predefined categories were dropped and events took over. The insight view needs to be improved in that matter. For the upcoming release we hide categories all together in order to not create confusion. Task-number: QDS-11443 Change-Id: Ia5faa8574d4c856c8a8ee341f74dc97094fc6cee 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> (cherry picked from commit 64b50adbf6a06058e6c05e15b134e8d72a46b1bc) Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlJSCheck: Ensure that ::createObjectsForImport always works correctlyThomas Hartmann2023-11-281-1/+3
| | | | | | | | | | | | | | If ::createObjectsForImport is called twice, then m_objectsByQualifiedName already contains the type and an empty list is returned. The returned list is used for the prototype lookup and in this case the import is empty and the prototype cannot be found. This happened for QtQuick3D.Effect when used from QtQuick3D.Effects in some cases. There is a race condition. The second call to ::::createObjectsForImport is quite rare. Task-number: QDS-11069 Change-Id: I6dfe152224172d0d626625d24a53f36d4219372f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Use QDS 4.3 in project templateThomas Hartmann2023-11-281-1/+1
| | | | | Change-Id: Ib9a6198512115780b6586242294c1c82fccd22dd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Describe Viewport ShadingJohanna Vanhatapio2023-11-281-0/+48
| | | | | | Fixes: QDS-11110 Change-Id: I098745446f421a37a8f263577aa4c098a5d13cea Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
* Doc: Update 3D view iconsMats Honkamaa2023-11-283-0/+0
| | | | | | Task-number: QDS-11241 Change-Id: I644b77813751081112cf9a6023c2bae265aa6fab Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
* Build/deploy: fix missing argumentTim Jenssen2023-11-271-2/+2
| | | | | | Change-Id: Ia73cfac75d336d7e321aef4059bb0eb6e4e3ed31 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake: make sure that deploy.py errors get caughtTim Jenssen2023-11-271-1/+4
| | | | | | Change-Id: I05f818145ed29f4521bddc36051ae504c13278d7 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: correct JavaScript nameTim Jenssen2023-11-271-2/+2
| | | | | | Task-number: QDS-10810 Change-Id: I74c97600fd6284743eb06afcbf4d93d0f6c67633 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Update DataStore.qml when collections changeAli Kianian2023-11-2410-25/+331
| | | | | | | Task-number: QDS-11113 Change-Id: I27d49d40a36a22e9af447087e7e8f7995812f1e3 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Cmake: DS does not want automatic detection of cmake help fileTim Jenssen2023-11-241-0/+4
| | | | | | Task-number: QDS-9780 Change-Id: I006b27ee21a910f6d5095f09406b0f4e95a62c35 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix Connections for items without idsAleksei German2023-11-241-2/+1
| | | | | | | Task-number: QDS-7711 Change-Id: Ie686a7a456dd8cee57d63480913cd6f636af3e91 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* qds: add Qt Shade Baker binaryTim Jenssen2023-11-241-8/+9
| | | | | | | Task-number: QDS-11387 Change-Id: Ibea4c241fcaaecffc7f3a29b8fc68fda442c5104 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Integrate newest base repository commitsHenning Gruendl2023-11-2410-34/+247
| | | | | | | | | | | | | * Update to newest version of ADS * Fix memory leak in DockContainerWidget Base repository was merged until commit 59b4dfb89c0c9c0e6035fe580088432312ed2d09 Change-Id: I357b21888fe6f0ec2160c8688d84cb7ecdcad079 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: Fix signal name prefix removalHenning Gruendl2023-11-241-0/+6
| | | | | | | | | | Only remove the first to characters of a signal name, if it matches the regular expression. Task-number: QDS-11385 Change-Id: Icc61f2c5281c15842729f67d3b0498c80637ceb1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* QmlDesigner: Fix Kit selector for MCU projectsAleksei German2023-11-241-1/+2
| | | | | | Task-number: QDS-10337 Change-Id: I896eb826d75fd9ee08e083d45b8f7180abf53c37 Reviewed-by: Aleksei German <aleksei.german@qt.io>
* ADS: Fix switch enum not handled warningHenning Gruendl2023-11-241-0/+3
| | | | | Change-Id: I7b9dd5f5cf3dde535aa099a9a64203060174123e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* EffectMaker: Don't allow saving with pressing enter if save is disabledMiikka Heikkinen2023-11-241-2/+4
| | | | | | Fixes: QDS-11392 Change-Id: Ia600489b39d58a0224f17856f9ab6e2110faee82 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* ADS: Fix FocusHighlighting when dragging tabHenning Gruendl2023-11-241-5/+4
| | | | | | | | Task-number: QDS-11172 Change-Id: Ibb159bb39a3e15797b468302c38531188e928ae9 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>
* ADS: Prevent saving not displayed workspaceHenning Gruendl2023-11-245-16/+18
| | | | | | | | | | | | | | | Prevent saving a workspace that was never shown, e.g. only welcome page was shown and QtDS was closed again. This scenario causes the workspace to have wrong sizes hence the next time this workspace will be shown it will look distorted. This behavior is a result of the startup workspace always being loaded and always saved. If the workspace was never visually shown, it didn't get the correct geometry from the main window which results in wrong sizes of splitters in the workspace. Change-Id: I780b561e98e72f7d48becf32d178fb600b5d4336 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Make minimumSizeHint setting passiveHenning Gruendl2023-11-241-9/+2
| | | | | | | | | | | Remove the connection to the minimum size hint setting and the active call to the dock manager and force the user to restart design studio to apply changes. Change-Id: I2aca66b02a1f7658a2dac7322f6a530bf9f6b084 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: Add wizard data for models and backend json dataThomas Hartmann2023-11-2415-35/+175
| | | | | | | | | | | Added the new files to all wizards, since the change of the qmldir file otherwise breaks the wizard. Adding json files to qmlproject for cmake generation. New files have to be added to cmakefiles.txt. Change-Id: If00eb4507b6f1364ce3cfa00db39632635febd09 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* EffectMaker: Bake preview shaders using correct version of qsb toolMiikka Heikkinen2023-11-242-25/+62
| | | | | | | | | | | | | | If the target kit Qt version differs from Qt version that QDS was built with, there is a chance that shaders baked for the target kit don't work for rendering preview on QDS side, if QShader version has changed between the two Qt versions. This means we must bake separate shaders for the preview and the project to use, each using the correct version of qsb tool. Task-number: QDS-11361 Change-Id: I44df2aeb3f4d6aa4b80e3be052d46735d96c53ef Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Hot fix for settings crashEike Ziller2023-11-241-0/+3
| | | | | Change-Id: I05d27fb2dee65c50191e7dcd7c7bf8f195bb46e5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix for MCUs styles comboboxAleksei German2023-11-233-5/+17
| | | | | | | | Task-number: QDS-11258 Change-Id: Ib1399e111daf14856e3e679619978180ba7da088 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* EffectMaker: Focus view upon open, and correctly open new effectsMahmoud Badri2023-11-233-9/+16
| | | | | | | | | | Also don't open old effect maker when creating a new effect Fixes: QDS-11359 Fixes: QDS-11364 Change-Id: Ie9659af991f10cafac29dc53cbe7163eb8995b2a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* Doc: Describe the split view in 3DJohanna Vanhatapio2023-11-233-0/+15
| | | | | | Fixes: QDS-1109 Change-Id: I849bd54109a9caaf9de989099495aa02dfd60a5f Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
* QmlDesigner: Add the Collection Singleton to the QDS templateAli Kianian2023-11-229-1/+79
| | | | | | Change-Id: I8bad907766dfa0f630cee935d2b587fc613b0922 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* QmlDesigner: Fix crash in QmlDesigner::TextEditorAleksei German2023-11-211-4/+4
| | | | | Change-Id: Ic511e5812bbe015f90f88f947faa50bb3461ae38 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ADS: Set default minimum size on empty dock widgetHenning Gruendl2023-11-213-30/+43
| | | | | | | | | | | | * Set a default minimum size on empty dock widgets. Dock widgets are empty if their content minimum size isEmpty (width or height <= 0) * Replace 0 with nullptr as return value * Fix some code formatting Task-number: QDS-11255 Change-Id: Ifa7320fd57e73367f71087232dedd939d19ae490 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
* Merge "Merge remote-tracking branch 'origin/12.0' into qds/dev" into qds/devThe Qt Project2023-11-2137-20826/+43416
|\
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 18:08:41 +0000