aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* QmlDesigner: Fix node component missing state propHenning Gruendl2022-06-081-1/+1
| | | | | | | | | | | Fix node components not showing the states property in the property editor. This is caused by querying majorVersion instead of majorQtQuickVersion. Task-number: QDS-6981 Change-Id: I0a87d921ce985f7fd58b92f526531c49622bb235 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Clang Format: Fix misplaced cursor after undoArtem Sokolovskii2022-06-081-1/+1
| | | | | | | | | | | | | | Fixed behavior, when after undo function cursor, jumps to the start of a file. Join the undo block generated by auto format with the last available undo block. This will place the cursor at the last edit position instead of the document beginning when triggering undo. Fixes: QTCREATORBUG-27608 Change-Id: I1bb630af00e997ac53f178594445293ceebcfa26 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlDesigner: Update QDS version in templateThomas Hartmann2022-06-081-1/+1
| | | | | Change-Id: I0bfbd469d49568ec2be0b6b936c46bbc9160fbcb Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Make text label visible in 3d wizardThomas Hartmann2022-06-081-6/+7
| | | | | | Task-number: QDS-7054 Change-Id: I44a2d01c799b619b553c6b1e76c003324e7b80ba Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: add new timeline animation iconBrook Cronin2022-06-081-0/+0
| | | | | | Change-Id: I69efb2ed5a56fbf1848d00963ae70002f11b2e75 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlDesigner: Ensure material library is created when neededMiikka Heikkinen2022-06-079-145/+144
| | | | | | | | | | | | | | | Added material library accessor to AbstractView, which creates the material library and moves existing materials under it in case it doesn't yet exist. Also added material assignment function to AbstractView. The reason these were added to AbstractView instead of being handled e.g. via custom notification in material editor is that they need to be called from multiple different views in the same transaction that triggers the need of material library. Fixes: QDS-7081 Change-Id: If2bb884f87d04c9f3599c2342df66ef51ec238ee Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add checkerboard background in navigator preview tooltipMiikka Heikkinen2022-06-075-24/+91
| | | | | | | | | | Checkerboard helps visualizing alpha channel in previewed images. Fixes: QDS-7060 Change-Id: Idb0139f8d8fcbf595bbfba3b333cd3d49f18d8af Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlDesigner: Add material library to 3D application project templateMiikka Heikkinen2022-06-061-5/+10
| | | | | | | Fixes: QDS-7065 Change-Id: Ifd270312c352d47facd32ff50543003171c0f718 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Import3D: Update call to importFile() after change in QtQuick3dChristian Strømme2022-06-062-3/+17
| | | | | | | | | | | The function in QtQuick3d will from Qt 6.4.0 accept the json object directly meaning it's no longer necessary to convert to a variant map first. Change-Id: If180672963cbfea78582f245431e246f84111c9b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix typo in module name in subclass checksMiikka Heikkinen2022-06-031-2/+2
| | | | | Change-Id: I3c235a742450640869128500c21824c7b96a8ee5 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix crash on project loadMiikka Heikkinen2022-06-031-3/+0
| | | | | | | | | Creating material library node in response to model change notifications is problematic, so don't do that. Fixes: QDS-7075 Change-Id: Ib688d71223a851b8a98e1c8fcfe598f6decdaf16 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix issues with quick3d private API changes in Qt 6.4Miikka Heikkinen2022-06-032-0/+18
| | | | | | Change-Id: I5974c7f663262c88810ddaac6f9c775d95749266 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Squish: Remove exec permission where not neededRobert Löhning2022-06-038-0/+0
| | | | | | | These python scripts cannot be executed directly anyway. Change-Id: I9ac3170450c4f8be4063b02ee8ec9df28f90cec5 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Fix adding the first material to the material libraryMahmoud Badri2022-06-031-4/+4
| | | | | | | | | | Fixed that material editor node was not being created when no materials exist. Fixes: QDS-7069 Change-Id: I358c497325e8865fc5f012531783dcbe46c32490 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Switch to components view upon model attachMahmoud Badri2022-06-033-3/+10
| | | | | | | | | | the "add imports" view looks confusing when it appears upon switching from edit mode or welcome screen to design mode. Even worse when it stays after creating a new project. Change-Id: Ibc3ff1adc7f6b653d443fec2b8f1803d6ac56ed9 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Update MCUs metadata for MCUs 2.2Aleksei German2022-06-022-1/+232
| | | | | | Task-number: QDS-7064 Change-Id: I645ece6228e30cb5d645c67a57b51f76e7375a3b Reviewed-by: Aleksei German <aleksei.german@qt.io>
* Fix tooltip text in 3D Editor toolbar background color buttonSamuel Ghinet2022-06-022-5/+7
| | | | | | | Task-number: QDS-6585 Change-Id: I397de9ac51b69697234f5f0dc48b90f330ec49d2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Move reparenting of materials into transactionThomas Hartmann2022-06-021-9/+16
| | | | | | | | | | | | Without a transaction we will reparse the document for each reparent. This will make the process very slow if there are e.g. 20 materials in the document. The new parent has to be created first. This cannot be part of the same transaction, because of limiations in the rewriter. Change-Id: Ie2c587d0f072b8163846c660dc2dd66bee7146c1 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fixup compile fixChristian Stenger2022-06-021-2/+2
| | | | | | | | | Use explicit type for local variable to have a consistent approach. Amends 6469f99. Change-Id: I6b7612e1f646e497699e278e4538f9cb4ae37c64 Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlDesigner: Fix Qt5 buildChristian Stenger2022-06-021-1/+2
| | | | | | | | Amends c3b90c0ce5e. Change-Id: I16e37678a7981c22c62eaf772c6d8f4f15594bac Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix small typoMahmoud Badri2022-06-021-1/+1
| | | | | Change-Id: Ic3fb65b8f8ecf80dcf65c21f5f3e5a35c42d0735 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Fix potential crashThomas Hartmann2022-06-021-1/+2
| | | | | | Change-Id: I85e5b7d8f03e270540294a20ccc24658943a2c9b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlDesigner: Fix corrupted preview images in material editor/browserMiikka Heikkinen2022-06-026-2/+18
| | | | | | | | | | | Now a default preview image is shown if real preview is not yet available. Fixes: QDS-7055 Change-Id: Ia2f9ee3aa3b29f49224b6ba8ae8f22f1b36f629a Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
* QmlDesigner: Mark unused params in material editor and browserMahmoud Badri2022-06-022-1/+21
| | | | | Change-Id: I5d1e2dcd340e766f829fe78edb63dfa8beacfa78 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Fix build with testsChristian Stenger2022-06-021-3/+7
| | | | | | | Amends c3b90c0ce5e. Change-Id: I52eee2e9bcf78a1fb7315927efc861115b96a16a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix build error: Allow changing the 3D Editor's background colorSamuel Ghinet2022-06-012-3/+7
| | | | | | Task-number: QDS-6585 Change-Id: Id87e5403a3c6d398aa9ebf85cc97cc4c9bf7a2a2 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Allow changing the 3D Editor's background colorSamuel Ghinet2022-06-0124-44/+369
| | | | | | Task-number: QDS-6585 Change-Id: Ibcac69d3792b521b29dfbdce2d49557d36de99a9 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Fix wizardsThomas Hartmann2022-05-316-28/+35
| | | | | | | | | | | Since we define an import for QtQuick to distinguish between Qt 6.2 and Qt 6.3, the way we determine "IsQt6Project" was broken. This patch reuses "IsQt6Project" now to determine the default style name and if we need a versions for imports. Task-number: QDS-7053 Change-Id: I7b5fc0b76e71c2874f5e6ac8457ba1deb87bb999 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Correct asset to material editor dnd behaviorMahmoud Badri2022-05-311-7/+3
| | | | | | | | Only check the first asset when dnd multiple assets to be in sync with the dnd handling in the QML side after drop. Change-Id: I32ecf6be87284dc8e32f51f674ba082fab7cad7a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Handle picking of models under View3D component properlyMiikka Heikkinen2022-05-319-19/+161
| | | | | | | | | | | | | If a model defined inside the View3D component is picked on 3D editor, the parent View3D is selected instead as there is no instance for the model itself. This is similar to how Node based component picking works. Fixes: QDS-6934 Change-Id: I4f273972da8cb1c55f03cab323dd9804a5d10def Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QtcProcess: Don't merge ready read signalsJarek Kobus2022-05-311-14/+0
| | | | | | | | | | | | | | | | | | | | We store pointers to signal objects inside m_signals list, so we can't easily merge the old ready read signal with the new one, since when flushing the m_signals from the main thread we are taking copy of m_signals, but this copy still holds the pointers to the original objects, and using them outside of locked mutex isn't safe. The possible solution would be to store simple data structures instead of signal objects allocated on heap. However, there is not really much gain of merging the ready read signals, so we get rid of it. Task-number: QTCREATORBUG-27578 Change-Id: Idd19a6fc1ebb4ccab1e4e367cfeb3f2f02a35512 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Fix 3D application wizard quick3d import version handlingMiikka Heikkinen2022-05-311-3/+6
| | | | | | Change-Id: I80eecdcd5ac9938715b084bd8b89c82d62aa7323 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlDesigner: Highlight material editor properties upon asset dragMahmoud Badri2022-05-3111-53/+101
| | | | | | | | | | | When starting an asset drag in the assets view, highlight all supported properties in the material editor. Change-Id: I60935756e4c1384edcc284068163d08ebe529a05 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Refactor ImageCacheHenning Gruendl2022-05-319-127/+101
| | | | | | | | | | | Move the ImageCache from the ItemLibraryView to a more centralized location. Change-Id: Ic0721976650dad8af26c29b50fed8aec0fffbf75 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* LanguageClient: Avoid crashes when language client is invalidAaron Barany2022-05-311-0/+2
| | | | | | | | | | This can occur in situations such as clangd crashing. A similar guard is used in the perform() function, but can still crash in cancel() or handleSignatureResponse() if the client is destroyed beforehand. Fixes: QTCREATORBUG-27096 Change-Id: Ib33d306c5411bc31bc13de399e6c2ad0a89462f4 Reviewed-by: David Schulz <david.schulz@qt.io>
* StudioWelcomePage: Disable data download by defaultThomas Hartmann2022-05-311-0/+19
| | | | | | | | | | | QML/Designer/EnableWelcomePageDownload is not set, no download or probing will start. Change-Id: Icadd29b2a8c0439ebd8435b987647f5d6f7167a7 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Remove a couple of work around puppet resetsMiikka Heikkinen2022-05-301-7/+4
| | | | | | | | | The issues that were worked around by these resets have been fixed. Fixes: QDS-7009 Change-Id: I7940b55c3f3edcfdcde9ad5f41cfa1d188d2bc96 Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Refactor library icon generation for imported 3D assetsMiikka Heikkinen2022-05-3019-127/+132
| | | | | | | | | | | | | | | | | | | | | | Previously, icon generation was done at import time, but that was wasteful, as we now have image cache backed icon generation available for component library icons. Added the few remaining missing bits to support icon generation for image cache and disabled the old icon generation implementation for Qt6. A few issues in fit algorithm for preview image generation were also uncovered and fixed to make icons render scene in comparable size to the old version. Qt5 imports still generate using old way since component library 3D previews generation doesn't work on Qt5. Fixes: QDS-6205 Change-Id: I5418fa19d86e81adcd184be023f1dfbc813d0bf5 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlDesigner: Remove hardcoded timeout from 3D import puppetMiikka Heikkinen2022-05-301-3/+2
| | | | | | | | | | It doesn't seem that this timeout is needed. Fixes: QDS-6909 Change-Id: I7794d8548acd75fbb220a20458d091f413b5fcbb Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Make timeline animations visible in the navigatorKnud Dollereder2022-05-305-0/+58
| | | | | | | | | | | | | | The timeline and timeline-animation is now visible in the Navigator regardless of the "Show only visible" filter setting. Also assigned icons to timeline, timeline-animation, keyframe and keyframe-group Fixes: QDS-6965 Change-Id: I85a735a3a1811dd783c98422358492fd4b71f61f Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Do not update animation range from inactive timelinesKnud Dollereder2022-05-301-10/+17
| | | | | | | | | | | | In a scene with multiple states and timelines it occasionally happend that the curve editor was updated from an inactive timeline. This is now fixed. Fixes: QDS-6948 Change-Id: I586593452e69cebe7bb2571e301230bf0ace8631 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Remove reference to emulation layerThomas Hartmann2022-05-271-5/+0
| | | | | | | | | This removes the reference to emulation layer in error messages. Task-number: QDS-7019 Change-Id: I120647266c007ce41481c4980a705d57b5a3e544 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Implement "duplicate material" featureMahmoud Badri2022-05-277-46/+81
| | | | | | | | | Fixes: QDS-7013 Change-Id: I28a11dbd9d6586631c0edcf8003e551917eaac98 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner.Wizards: Extend version comboboxThomas Hartmann2022-05-278-19/+63
| | | | | | | | This patch allows to distinguish between 6.2 and 6.3. Change-Id: I9ba4c9984673e9e9e6f7d50a1ea35704f7e00211 Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Show form editor preview for 3D material root nodesMiikka Heikkinen2022-05-2716-195/+426
| | | | | | | | | Fixes: QDS-6561 Change-Id: I62a06eb6c83b0a4813a1b20f91b09e17b04a1332 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlDesigner: Add QtQuick 6.3 as supported versionThomas Hartmann2022-05-241-19/+3
| | | | | Change-Id: Icbb1d2a3c7584cc24f0d8dde467d07678925711c Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Bump version to 7.0.3Eike Ziller2022-05-243-6/+6
| | | | | Change-Id: I861b3b9c5616297af12e04b39bd157107a27055b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: focus material browser upon openMahmoud Badri2022-05-244-5/+9
| | | | | | | | | | | When clicking the open material browser button in the material editor, focus the material browser window if it is already open. Also do the same when opening the material editor by double clicking a material in the material browser. Fixes: QDS-7006 Change-Id: If64d1ff6595dea5e33771485622322df708405d9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Unify empty text between material editor and browserMahmoud Badri2022-05-242-3/+4
| | | | | | | | Make the text indicating that there are no materials, same size and content between the material editor and browser. Change-Id: I6e9e46c30d89aed090b504b256b113e2601b4659 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Disable apply material to selected when no selection existMahmoud Badri2022-05-248-12/+52
| | | | | | | | | When there is no valid model selected, disable the "apply to selected" actions in the material editor and browser. Change-Id: Id8e771c64e69c0ba2f42dff01d19ffbf4afafb77 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>