aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Use simplifiedTypeName also for m_backendValueTypeNameqds/v4.1Thomas Hartmann2023-05-121-1/+1
| | | | | | | | | In some cases the type has a QML prefix. Task-number: QDS-9880 Change-Id: I3752970a6e2006dc8813976bf50a94bf375741fd Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit e5a262a8d57a87a9ebd88837d93c1d6fd65ebe69)
* QmlDesigner: Fix compile errorMiikka Heikkinen2023-05-121-1/+1
| | | | | | Change-Id: I6694cd0d48eb00d64be93019d4af418e64ad23a4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit 0cee9e327ab9f268e5584e3839d08209f0833fad)
* Revert "qds: workaround that appbundle finds the images"Tim Jenssen2023-05-121-5/+0
| | | | | | | | | | This reverts commit f3fcce9f4fbba439aae3a0fa85a6261456367e7d. Reason for revert: produces other problems Change-Id: I2225ffc96d30a9dc175a977602f7c8378b5cb31c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit 7a21214a2284ea0cab1fc536b9e407460eecb5d2)
* QmlDesigner: Fix denoiser path for macMiikka Heikkinen2023-05-121-3/+1
| | | | | | | | Fixes: QDS-9870 Change-Id: Id847cb6efad0bf1d57e6f159adde68dec1843990 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> (cherry picked from commit 2ded8a3842ef4d8cf200da604ccec24a9c468984) Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* qds: workaround that appbundle finds the imagesTim Jenßen2023-05-111-0/+5
| | | | | | | | | Task-number: QDS-9856 Change-Id: I4efe17b7a5daca12f29ac2d63bde3b5c8c3a142b Reviewed-by: Burak Hancerli <burak.hancerli@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> (cherry picked from commit 7c9a64c0e09c1ae81b1769d2c8f122d4a26ead40) Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* qds: use QtQuickEffectMaker app bundle pathTim Jenßen2023-05-111-1/+4
| | | | | | | Change-Id: Id267d50007766b2849b71d7ff9393d6de6f9e3c0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> (cherry picked from commit da1ccc2a9adf8244d30f478b566f5f1ceb00b569) Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Revert "QmlDesigner: Add setting to force download mirror"Tim Jenssen2023-05-101-11/+5
| | | | | | | | | | | | | This reverts commit 6a4313b7a8d06a3a6951be9203dbc26be9f0405b. Reason for revert: does not compile on linux and it is maybe not a good idea that utils static lib gets a core plugin dependency Change-Id: I2bf153f94aa922a82776b490238ba0ba774d26aa Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit 57f7085d31dc4ed721632ca417760c80355ae80d)
* QmlDesigner: Add setting to force download mirrorThomas Hartmann2023-05-101-5/+11
| | | | | | | | | | Add setting QML/Designer/ForceDownloadMirror to set a specific mirror for downloads. Remove private QQmlData usage. This was for debugging and the issue was fixed. Task-number: QDS-9687 Change-Id: Icf9a2e2db7d60b13f37d7f51b857cbe7c0a1c3b4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: fix hardcoded types for Qt 6.5.1Thomas Hartmann2023-05-081-2/+3
| | | | | | Task-number: QDS-9737 Change-Id: I286d706b506904b4d6f22549d1ec294d16859df0 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix crash upon creation of wizardSamuel Ghinet2023-05-081-0/+5
| | | | | | | | Task-number: QDS-9532 Change-Id: I2ce4e6e9597798a023c626c6b8e5dee6a1570e03 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit 70c51f236a30862ba2b430622ef69136d6ab25a1)
* QmlDesigner: Fix crash in FileExtractor when compressed size is 0Samuel Ghinet2023-05-081-1/+7
| | | | | | | Task-number: QDS-9832 Change-Id: Ia096b5770359ea16171cae0634fea340264194e1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit 86e4d171df3f4afc37a180974c1eb1330b0a1629)
* QmlDesigner: Fix crash at filtering the Style Model in QDS new dialogSamuel Ghinet2023-05-051-0/+6
| | | | | | Task-number: QDS-9731 Change-Id: Iac64d109fa125f67ab3e713e07ebbc3e519d5ac5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix for Qt for MCUs metadata, sheetsAleksei German2023-05-0511-88/+580
| | | | | | | | | | | | | | Includes: - adds metadata sheets for newer version - bumps metadata.qml default version - tweaks to allowed properties and types - some resorting and minor reformating of the metadata - property editor sheet mcu-related changes for Timer Task-number: QDS-9823 Change-Id: Iedb27047c533b80ba008afeee1ea28a99c8ab19d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Aleksei German <aleksei.german@qt.io>
* QmlDesigner: Remove version from textures URL for the Content LibrarySamuel Ghinet2023-05-041-1/+1
| | | | | | | The URL for textures should not have a version number. Change-Id: Ifb0103d8420f9f3b3269657875ca184533700da5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Assign the correct context to QmlDesignerAli Kianian2023-05-031-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The context would be updated when switching between different modes. Some wrong conditions had caused to prevent this update before. Before this change: QmlDesignerPlugin ignores hiding the designer when the new editor is raised by the editor manager because it hides the designer only when the current designer is QtQuick. So, the previously opened document is kept by the document manager, since hideDesigner is not called. Then, when the user decides to go back to the designer mode, the QtQuick editor is opened, but the previous document is opened, so the QmlDesignerPlugin will not call showDesigner (Even if a different file is opened now). With this change: QmlDesignerPlugin calls hideDesigner when a non-QtQuick editor is raised by the editor manager. It compares the file paths of the editor and the design document. So, if they are different, it will try to open and show it again. Task-number: QDS-9686 Change-Id: I6b962f22a1f3863128ac6a40780fdceeecaec040 Reviewed-by: Ali Kianian <ali.kianian@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix puppet crash on View3D removalMiikka Heikkinen2023-05-021-3/+5
| | | | | | | Fixes: QDS-9591 Change-Id: Idff3e996c66296863b7549b7d8649049497642e0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* OutputPane: Fix initial pane title not setHenning Gruendl2023-04-281-0/+3
| | | | | | | | Fix the title of the initially selected pane in the output pane placeholder toolbar not being set by the output pane manager. Change-Id: I94407c76454a632a9b5707edcbde0ce6dc990d61 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix view menus intially enabledHenning Gruendl2023-04-281-6/+21
| | | | | | | | - Fix views, workspaces and output menus being enabled in welcome mode - Use mode instead of context change to enable/disable menus Change-Id: I68053112d66e100e3bf3b07368310a3c3c50999d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* OutputPane: Add setting to restore previous paneHenning Gruendl2023-04-282-2/+13
| | | | | | | | | Add a setting to store the previously used output pane index to be able to restore it on startup. Task-number: QDS-9647 Change-Id: I2ef277e8d4c79a6d0b017e5422ad639b56b2140b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Remove isAvailableInVersionAleksei German2023-04-282-18/+2
| | | | | | Task-numbers: QDS-9420, QDS-9421 Change-Id: Ic93cb6e24c4049d6982344a9d8420b8e567c8265 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* StudioWelcome: Fix crashThomas Hartmann2023-04-281-0/+3
| | | | | | | | | We have to if the project actually has a QmlBuildSystem. Task-number: QDS-9804 Change-Id: I1740f1c0772641888a8828b10380f442308bfe46 (cherry picked from commit 5f3c91180f7f5ecd2bfa15f11b3d5742f1e26ea4) Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add workaround for easing and Qt 5Thomas Hartmann2023-04-271-0/+4
| | | | | | Task-number: QDS-9391 Change-Id: I464c12d3c9b154b4283ee7db5262ca43f7824b56 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix SpinBox value reset on focus lossHenning Gruendl2023-04-271-14/+14
| | | | | | Task-number: QDS-9770 Change-Id: I8a4d73e7abe8dbb5c62c571fc9980a0f78a5f819 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Cleanup mcu deploy stepKnud Dollereder2023-04-272-100/+84
| | | | | | | Change-Id: I4f4fa4f9067613cb31c7408a89a25cf27f2093e3 Reviewed-by: Aleksei German <aleksei.german@qt.io> (cherry picked from commit 3f32409748f6e52eb2268851b578edac31eaf82a) Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlProject: Fix mainUiFilePath()Thomas Hartmann2023-04-274-13/+7
| | | | | | | | | | | | The method mainUiFilePath() is supposed to return the actual file path that is relative to the project file. Removing mainUiFilePath() from QmlProjectItem, since QmlProjectItem is supposed to contain only the pure data. Task-number: QDS-9650 Change-Id: Iad474586cad8f8cef745aadb63d421573d7d9c83 (cherry picked from commit 7c7a0fba57788875066e7f0180f1e570ee93033f) Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Activate kit after addingThomas Hartmann2023-04-271-4/+8
| | | | | | | | | We do not remove other targets anymore and instead activate the added one. Task-number: QDS-9652 Change-Id: I29d5b9e878b928611a1e854fd212682153b89d63 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Block more importsThomas Hartmann2023-04-271-1/+4
| | | | | | | | | Block QtQuick3D.MaterialEditor, QtDataVisualization and QtQuick3D.ParticleEffects Task-number: QDS-9799 Change-Id: I68e2f7a467f4e6c7e6ba1ebfedf7880425b2fdda (cherry picked from commit 23a5d2b7a8cf61f7f191fae7559b5143323b3284) Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* FileInProjectFinder: Fix path analysisUlf Hermann2023-04-261-1/+4
| | | | | | | | | | | | The previous code let to all possible paths to be accepted with maximum confidence. Fixes: QTCREATORBUG-29090 Change-Id: I3e0876d2fd1a5636dbe45cf152c8a251316185ff Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit 032c3c1c2b884a5e3dafdbf4ac7e38bdab8dde31)
* QmlDesigner: Fix macOS path for qlmdenoiserMiikka Heikkinen2023-04-261-1/+1
| | | | | | | Change-Id: I6f8931dc59615d736c42014e048301b4d1c58d74 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> (cherry picked from commit 5a15554b1202573b0395a3ee6d5dc194bb64f504) Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add versioning for core modulesMarco Bubke2023-04-26118-13/+1971
| | | | | | | | Repush now with correct parent commit. Task-number: QDS-9786 Change-Id: I0e3b0f5c6e189231ef30b2e97a29151153af9bce Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix version scanningMarco Bubke2023-04-262-2/+18
| | | | | | | | | | Switch was missing. Change-Id: I5d87e624f698b9f59fe57cf49cafef4e6d08eca2 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Aleksei German <aleksei.german@qt.io> (cherry picked from commit 45cf905b295b311c614e8c62e0f9a42f97c98fe5) Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Revert "QmlDesigner: Add versioning for core modules"Tim Jenssen2023-04-26118-1994/+12
| | | | | | | | | This reverts commit 9e8791a73bc087898a7bdc26e39897c62b46204a. Reason for revert: unresolved conflicts Change-Id: Ia57a1e9e638ec471af89b5c2f326084bdbf369ae Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Place qmlpuppet configuration in system import pathUlf Hermann2023-04-261-1/+1
| | | | | | | | | | | The system import path is called "/qt-project.org/imports". The fact that the qml tool gets this wrong doesn't mean that qmlpuppet has to get it wrong, too. Task-number: QDS-9342 Change-Id: If6e2c636b840d112e566ee4b67e916f97a8d52e5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit d52357be1cabd7ec44e589c15b03d781cab0001e)
* QmlDesigner: Block more importsThomas Hartmann2023-04-261-1/+7
| | | | | | Change-Id: Ie6892d32594cc4f742ff48bebd82584e1ae2f82c (cherry picked from commit f4f1dbc34304848b4e95838c965d0bb92076ed96) Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add versioning for core modulesMarco Bubke2023-04-26118-12/+1994
| | | | | | | | Task-number: QDS-9786 Change-Id: I56c6e9ca06ffcfcaf35cbbee061cb99e7297fca5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Burak Hancerli <burak.hancerli@qt.io> (cherry picked from commit e5796e88a19ab0f0477568ef5bdc1d3452c651ce)
* QmlDesigner: Remove duplicatesMarco Bubke2023-04-262-6/+28
| | | | | | | | Change-Id: I5b2d8433c0aca286ec530f237750ba660c409a48 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io> (cherry picked from commit eafe43399d29502ecd06be6976a4f2509b20c9ee) Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix QmlTypesParserMarco Bubke2023-04-264-15/+13
| | | | | | | Change-Id: I826e1a37747a51602f3f7a8ea675320787080272 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit b929cbfd64bba1950b2252576e2c620ad03485d8) Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix project file getter/setter issuesBurak Hancerli2023-04-2615-23/+116
| | | | | | | | Task-number: QDS-9781 Change-Id: I2df8cca1c4e5cd10563621b849fb54b29c0d155d (cherry picked from commit d5847e9e115a1b4a0bf36cea652724fdaeda28c3) Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Update possible modules for import changesMarco Bubke2023-04-262-1/+2
| | | | | | | | | | | | Maybe we should rename possibleImports in the module to modules() to make it clear. Task-number: QDS-9749 Change-Id: I46675d7eaca1f86ea4fe6e5841273e78a8ea2508 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit dc4d0da49900b06588286e1c8799e9873cc34c8a)
* QmlDesigner: Use RESOURCE_PREFIX for QmlRuntime.QmlConfigurationThomas Hartmann2023-04-261-0/+1
| | | | | | | | | See: QTBUG-104554 Task-number: QDS-9342 Change-Id: I3e097a2c4dd27673ec2a9a7d3e3e9b1e82a722ff Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit 3d3ac0fca88ea5bd1a72e547516920bf00fda633)
* Doc: Add Qt Design Studio on MCUs intro topicEsa Törmänen2023-04-257-2/+136
| | | | | | | | | Added the Add Qt Design Studio on MCUs intro topic and modified the related topics (index, toc, and external resources) accordingly. Task-number: QDS-9284 Change-Id: Ibdf27111170b2931511e2ab349ec07210a02e70b Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
* Build: Add SOURCES_PROPERTIES to extend_qtc_targetEike Ziller2023-04-212-10/+11
| | | | | | | | | | This way the check if the target is enabled and the condition is met doesn't have to be done manually. Change-Id: If490a84fd5f1ede2d032c3800f69ede4f755bc2c Reviewed-by: Marco Bubke <marco.bubke@qt.io> (cherry picked from commit 30bd12d8dc668631ab21831ac32588a5a304f533) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Abort lights baking if no response from quick3d sideMiikka Heikkinen2023-04-213-2/+7
| | | | | | Fixes: QDS-9666 Change-Id: I8721e1076bda7113dca9afde9998548e232a2186 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Expose objectName for Qt InsightHenning Gruendl2023-04-213-24/+50
| | | | | | | | | | | - Expose objectName in Property Editor - Rearrange Annotation button in Component Section - Fix enabled state of insight view - Add reset of Property Editor when enabled state is toggled Task-number: QDS-9355 Change-Id: I873994580d8135f97236b6a98462c513169ac8c1 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* StudioWelcome: Use DocumentsLocation for examples also on macOSThomas Hartmann2023-04-211-3/+1
| | | | | | | | This was a workaround for macOS (QDS-6305). Task-number: QDS-9232 Change-Id: If85d2f950765d8114d8de60ab1dd5126845bb599 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix the crash caused by calling GlobalAnnotationsAli Kianian2023-04-213-4/+12
| | | | | | | | | | | | - Calling global annotations does nothing if we are not in the design mode - Related actions and buttons are blocked while we are not in the design mode Task-number: QDS-9729 Change-Id: Ib4d5e8c5adcbb080f42a2344cd76ce7c36532240 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add .qsb files to projectThomas Hartmann2023-04-211-0/+4
| | | | | | | | Since they are compiled shaders I moved them to a separate filter. Task-number: QDS-9718 Change-Id: I23346ef180419feabedd018ed0c79123f6a3d7f7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Fix crash on shutdownThomas Hartmann2023-04-211-3/+3
| | | | | | | | The style is owned by QApplication and QApplication does not expect the style to be deleted by QmlDesignerBasePlugin. Change-Id: Ia6526cf9920646a8a61d8c9847ab495fad382ea7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Avoid duplicate module namesThomas Hartmann2023-04-211-0/+7
| | | | | | | | | | We get every qmldir file twice and some files report QtQuick multiple times. This needs to be revisited. Change-Id: I2271f71ee7da2c182fed468fa3ef8aca63785bb4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add missing returnThomas Hartmann2023-04-211-0/+2
| | | | | | Task-number: QDS-9739 Change-Id: I4b48aaa72a906954ceb96b71e2b20efb76ac3d42 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>