| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
The buildsystem might be missing.
Change-Id: I05e03f59a2fcb49ce1ff7a2521ed1af165730b51
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit bcd74a2fad243fc7683fd98633b91da4e394c0e8)
|
|
|
|
|
|
|
|
|
|
|
| |
We try to access projectStorageData but it does not exists. Now we
return a dummyProjectStorage() instead. Because it is never accessed if
we don't use the project storage we should be fine.
Change-Id: Ic36a27472e95012b29b15ad33d2abe01507d64b4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit c940cc546626e4cce8034d72dfc67de8dc7a55dc)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since this is a throw away branch we can hardcode the fix
for Qt 6.4.3.
See 0c7ae672a211d670d70e6a872809b76919e17b45 for the proper fix.
Task-number: QDS-9560
Change-Id: Ic519541e2f6ed3efa5e38c9dbeb71390632b8b58
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
If there is no ui.qml file then fallback to .qml.
Change to design mode in any case if a file was opened.
Task-number: QDS-9460
Change-Id: I619292019105f488ff33e6e5ed4294b36eb2627c
(cherry picked from commit b63cb2603e4227234f7a2fa255df437f6ab24eeb)
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
|
|
|
|
|
|
|
|
| |
The combobox will break bindings on current index. Therefore
we cannot use a binding on the instances.
Change-Id: I5b4ede02b8b945429b37efa4fc3e1acc15b3fbe7
(cherry picked from commit d61830f91f5a6060ab5eaa73e77a2fa9d7e0db35)
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Fix issue where an invalid path results in QDir being set to "." which
in some cases results in iterating a huge amount of files ultimately
causing QtDS to stall.
Task-number: QDS-9437
Change-Id: I0f868f1a94341fbd4d18e98de012ecd5d2a6423a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit 9b4decf9afa7002cd28086caec2510290a89f339)
|
|
|
|
|
|
|
|
|
|
|
| |
Undo works strickly on the text editor and we wait 600ms
until we propagte changes from text editor to the model, to not
interrupt typing. In this case we should force the update immediately.
Task-number: QDS-9440
Change-Id: I5c854e7b4c6936e02c57d4cc7433a6e0ede50af4
(cherry picked from commit d26e35b221c51ed56237dff47d48fcb204e317f0)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QDS-9439
Change-Id: Ic80ea2558f6b41da127000441a75773d382f5a05
(cherry picked from commit 925b08d6e6e47d41ae56f1d63a722ed99e0b0b34)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Checking the possible imports can be slow and is not required
for copy and paste. Doing the same optimization for the style merger.
Task-number: QDS-9441
Change-Id: I7485a8f897db3d0fa595695bef10d315e93ff73e
(cherry picked from commit 0a34c41b18e1b819b380286b27592f0446e3524d)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QDS-9438
Change-Id: I6971f092ba1106c108bab8a9264e1e0dc84310e5
(cherry picked from commit 6665ddf3352d75e48d2f8b695788aeda562f24a0)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
| |
Change-Id: I3fd76cced3233afca90158717fbff400126a09c6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit f34bd3309d77eca5a79adc931c1d34a72b4a6f4d)
|
|
|
|
|
|
|
|
|
| |
We also have enterprise dmg for example at the QtDesignStudio
case so we need to replace the default LGPL with enterprise.
Change-Id: I059e056cd4fda02f8befa72a2b694ade471b7f47
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit e0059feef55c17e08c8c3612e4f15c96d64c00b2)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
if (QmlDesigner::checkEnterpriseLicense())
does not require any ifdef and is the proper solution.
Not taking any risk in the qds/4.0 branch, though.
CHECK_LICENSE is never defined in QtC.
Change-Id: I0a6098f362cd78de4e972044340b296cb0559099
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The dmg size for QtDesignStudio can be much bigger
then the default size which is enough for QtCreator.
Change-Id: I2a7cbe01ca05fc32bb3b6b5a82c1670f9703ae50
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit e549ad4d01168226089dbaa993c3806d51084d68)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
| |
Change-Id: I7109b25097d061dbbbc8828273b5d0acfe94bf3c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit eb16c66552e3e0b9961c15ee7f851282c9fbdf80)
|
|
|
|
|
|
|
|
|
|
| |
https://kb.froglogic.com/squish/mac/troubleshoot/hardened-runtime/#which-entitlements-squish-needs
Fixes: SQUISH-15904
Change-Id: Ib3a07ce2cb33d8fef63b21b19af3b7aabbab88ea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
(cherry picked from commit 78d17390b8b922efa7681e1ebab7d8c626a1f66d)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
| |
Change-Id: I7142da6d8fc61643512ff2ae6f581bf6795ab802
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit ef6ab90d1c0de436fbdb79dc6fbea2791bf91da4)
|
|
|
|
|
|
|
|
|
|
| |
This is necessary to not pollute the signed and notarized .app
bundle.
Task-number: QDS-9113
Change-Id: I74e0bced5679faac94b27d2a31ea10a7949fb21f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit b619f24396ab5d446f39d2d53904829254c19a80)
|
|
|
|
|
|
|
|
|
|
| |
Old Qt5 specifics sheets specify caption property for ColorEditor,
and fail to load if the property doesn't exist, so define the property
for compatibility purposes.
Fixes: QDS-9256
Change-Id: I6b56d98fd711d21272e914f6e167aa1cf8e07070
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
|
|
|
|
|
|
|
| |
Task-number: QDS-694
Change-Id: Id8f75d34d81645e9d4ceccff25e57afb658f8777
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
(cherry picked from commit b35f14752a471b3e51a5444061facd6abea36e70)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: Ie7c0fb42ad1b62f842d27c4656e34a627a603a7b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
(cherry picked from commit 7bfe5bf3236acafdff6d9091fc0ace68e2abb7ed)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: Iab57fd51b962bcb174c4d004e4cfed1500bb4e74
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
(cherry picked from commit f61266b829c6960a5e427002586f85d1733f5581)
|
|
|
|
|
|
|
|
|
|
|
| |
If drag is accepted but drag ending is not notified to model, other
views will not know the drag has ended.
Fixes: QDS-9254
Change-Id: I1446bd4b52ce67afc37194c98e5c60e169fb57b9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
(cherry picked from commit d3d621a7b30cf2a250a6877e828b0794322bd4d8)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
This is to avoid search box focus loss if search autoexpands sections.
Fixes: QDS-9259
Change-Id: Ief99643d52413fe83d4b5ac5ea3438d6116d64c7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
(cherry picked from commit 26e2342e248bc89eca2e721c28d069506c008966)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed focus loss on context menu close.
Fixed an issue with main view also handling cursor and enter keys when
editing material name.
Expanding a section now focuses the expanded section.
Dragging items from content library now focuses correct section.
Fixes: QDS-9215
Change-Id: I2176c7e52d8855c547db426b55ab739ca8f1db06
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
(cherry picked from commit d39f469e513539987da15d402b577ddde62427c6)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QDS-9184
Change-Id: Ic45d778b0ac3704c8f706fb2a7ab00103cc1d145
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
(cherry picked from commit d42af9246f2e2ce5602e4be2335a17d419ee0c69)
|
|
|
|
|
|
|
|
|
| |
This import is not to be supposed to be used in the QDS context.
(cherry picked from commit e0b75769d6ecd02072062fd3b61d910be969af75)
Task-number: QDS-8958
Change-Id: I9dbe270f9e9ceefad4c4c45e1e9ecaa2771290b3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
|
|
|
|
|
|
|
|
| |
Without probing enabled the download will not be triggered.
(cherry picked from commit e24242a6f3eaa1f16a5e083754f0ad89bea923b3)
Task-number: QDS-9253
Change-Id: Iae4669a2a088aba1b2078a035be2ac21b2d1bc41
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
|
|
|
|
|
| |
(cherry picked from commit 57ef24fa77d1c2da593c36540560c5e5fae88150)
Change-Id: Id6f599faa203e3260ba4cdd6a3677ddafa1a0a75
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
|
|
|
|
|
| |
Change-Id: If970dd2da0130bc0181a656a075b9e71cd0bf0d7
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
To make Alt+p shortcut for live preview work, it must be registered
to ActionManager. We use global context for this action as it should
work regardless of which view is active.
Shortcut is now also available in Settings/Environment/Keyboard, since
it is properly registered.
(cherry picked from commit 8b5c454881dcad5436dc3d7fb97642f65bfba2ed)
Fixes: QDS-9229
Change-Id: Iee9671acd58f264bdb7b035d0ff1a343bcbd223e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Also refactored Asset class a bit to optimize cases where multiple type
checks are done against same asset by resolving type at constructor
instead of on demand. Pretty much all cases where Asset instance
is needed also require resolving the type, so this makes sense.
Refactored the remaining cases to not create Asset instance
unnecessarily.
Fixes: QDS-9128
Change-Id: If9d518c9dcfcc70962e5d4e9881889c6ac243c97
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
(cherry picked from commit 0b9eb65d975b499179db32457f1e76009914efe1)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
| |
(cherry picked from commit 6cf253e90e45ba50b8fde46a9ab3add143f993ee)
Change-Id: I86bf7589930344fcf707f636663c067343668e69
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
When doing a search, some textures appeared misaligned. This was caused
by the fact that the "invisible" (i.e. hidden) textures had their Image
set correctly as invisible but the delegate itself remained visible.
Task-number: QDS-9234
Change-Id: Ia2cd6f4f6795bb435567b8915e770b78461babed
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
|
|
|
|
|
|
|
|
| |
If there is no main ui.qml, then fallback to the first ui.qml in the project.
(cherry picked from commit a7d7df3312a8428be21a17390a36980a9f1518ba)
Task-number: QDS-9242
Change-Id: Ie5294aeaf087a6b7cd2ca21ec13fb674c496f1a9
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
|
|
|
|
|
|
|
|
| |
Task-number: QDS-9236
Change-Id: I326ac238bf9a0a8f519a32fb9fc1c9ac6da15cb4
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
(cherry picked from commit 50203988656bc29db9ae1e50b2d07300cb8ab0f7)
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
|
|
|
|
|
|
|
| |
Task-number: QDS-9235
Change-Id: I8802582f5a1574961dfbffdb599b1e10192bc196
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
(cherry picked from commit 5c9758a1049e6bb2adfdd3a26bed3b1d5f3bbd3a)
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
|
|
|
|
|
| |
Change-Id: I425bbf715164ee41fc4d9bca37c25f09f9093871
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
(cherry picked from commit 8ed634fde160d34706a251449a17a3120d7379ad)
|
|
|
|
|
|
| |
Task-number: QDS-9242
Change-Id: Iecd0271014d2f3e3ea8b3cb13271c2cf4a612ce8
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
|
|
|
|
|
|
| |
Task-number: QDS-9242
Change-Id: I9811762f7f138f2ea0ffcb3fb93e0225cbd47e51
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
|
|
|
|
|
|
|
| |
See: QDS-8861
Task-number: QDS-9110
Change-Id: I654c7e6a961d9791533564593906323149d2395b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Instead of using the paths to the real, downloaded textures, the paths
of the icons (thumbnails) were being used.
(cherry picked from commit e831c9e7133b280fefa52374010623c513de8e9f)
Task-number: QDS-9228
Change-Id: I828b765c4f86502403b84fdf18532d1353d3a62c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
|
|
|
|
|
|
|
|
| |
(cherry picked from commit f45080e6193e82630fb66777c72e5f18661d697a)
Task-number: QDS-9227
Change-Id: I1f0c147e2dfd69bee9da0872b15d796741b57609
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Previously, the user would have downloaded the real texture even when
clicking with the right mouse button.
(cherry picked from commit bf61be5cc0a08d28a1327c081d6f547587d3591b)
Task-number: QDS-9226
Change-Id: I4040cda4a8c541edc12b4bfe821a09c76eb7efc4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A "locking" mechanism was implemented to prevent multiple textures from
being downloaded at the same time. However, there was a mistake made,
which made it so that when a texture that had already been downloaded
was clicked again, this locking would be enforced and not released.
Also, fixed minor issues:
* The download button now has a black outline, so as to better
distinguish it inside black-and-white textures
* Canceling the download of a texture no longer marks the download as
failed -- it should show it as if the download was never attempted.
* Fixed tooltips not showing the texture size for downloaded textures
- and now we also update the tooltip text after the real texture has been
downloaded.
* Always creating the "target path" in the FileExtractor, if it does not
exist -- this is different from the "target folder" name, which is an
folder that can optionally be created inside this "target path"
(cherry picked from commit 87f76d9bfa9e13b12105725ee0b528f6ecd40161)
Task-number: QDS-8664
Change-Id: Ieac0e81a5595a8bff3d1aa7ff6252e16c2509c2e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
At this point the textures_bundle is still required, but only because
of the icons of the textures. Also, some changes should be done for the
visuals of the downloading.
Also, did a fix in FileDownloader: In case the URL given does not look
to be an image file, we should cancel the download instead of treating
it as a zip archive--it can be that eg we were redirected to a sign-in
page and we don't want to download the content of the page and save it
as a zip file.
(cherry picked from commit 1a6cc6fa5eeb79f6cbc2d58b5205dbcddc9a3581)
Task-number: QDS-8664
Change-Id: Iec40e540c116030288df76e1922eab56ba323d1e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Since we adjust the semnatics and allow a mode change if there
is a ui.qml file (even though the design mode is technically disabled),
we require this extra emit.
Task-number: QDS-9040
Change-Id: I1536b6ee9349ab49cca77c7c29b3abe8c7bac973
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit 06b6d5d7682a2745cbd6b127da8f20b95444c187)
|
|
|
|
|
|
|
|
| |
Change-Id: I5dda141374b2804bab009359b1826aea9ba16e31
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
(cherry picked from commit 0d8c76e853b8d8becb3b836988089078ff31fd0b)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: I65f0ce65113f9d8b4af0ea95a914e2fd4fc2bb07
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
(cherry picked from commit d105b20c7e0e6f1ddf6c449fe1b1e9abbd2bf80f)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|
|
|
|
|
|
|
| |
Change-Id: I9dbb5ac43f47820da54e0fe9c8ffcf22a9b05507
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
(cherry picked from commit cb2ffbcc09f586d4a73530c56fb5c5553cc299a5)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|