From c68a42925e446a2df79fcba529bcb70e0a588459 Mon Sep 17 00:00:00 2001 From: Pranta Dastider Date: Wed, 28 Sep 2022 13:31:10 +0200 Subject: [PATCH 1/4] QmlDesigner: Add new comment to document Here the document is exclusive for the Enterprise Version of Qt Design Studio. So, I have added a comment at the top, to keep it clear for the users of other Qt Design Studio version. Task-number: QDS-7814 Change-Id: I2fdf56ce6bb46e4b0103631747cc57c9d722a603 Reviewed-by: Leena Miettinen --- doc/qtdesignstudio/src/qtbridge/qtbridge-figma-setup.qdoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-setup.qdoc index c2d00f2727b..6f354aed634 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-figma-setup.qdoc @@ -29,6 +29,8 @@ \nextpage qtbridge-figma-using.html \title Setting Up \QBF + \note \QBF is included in the + \l{https://www.qt.io/pricing}{\QDS Enterprise license}. \QBF is delivered with \QDS as a developer plugin that you can install to the Desktop version of Figma. To install the plugin, open the Plugin Manager From 75e5f6084879ba5b1b740b93b0a8538a78315d5b Mon Sep 17 00:00:00 2001 From: Pranta Dastider Date: Fri, 23 Sep 2022 15:41:11 +0200 Subject: [PATCH 2/4] QmlDesigner: Qt Bridge documentation fix Here the documentation mentioning reverse importing assets from Qt Design Studio to external UI design tools were removed to make the information relevant and less misleading considering the current state. Fixes: QDS-7708 Change-Id: Ifc484af4c95b82f01ca9f74cc7dba529bd7eaa61 Reviewed-by: Leena Miettinen --- ...tdesignstudio-exporting-and-importing.qdoc | 36 +++++-------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/doc/qtdesignstudio/src/qtdesignstudio-exporting-and-importing.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-exporting-and-importing.qdoc index 986bdfafbe1..1b67beafef4 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-exporting-and-importing.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-exporting-and-importing.qdoc @@ -30,35 +30,24 @@ \title Asset Creation with Other Tools - Typically, you as a designer would design a UI using imaging and design - tools, such as Adobe Photoshop, Sketch, Figma, Blender, or Maya, and then - send your design to a developer for implementation. You can use the \QB - export tool to convert 2D assets into a metadata format supported by \QDS. - You can use the export functionality of 3D graphics tools to save your 3D - assets in a format that can be imported into \QDS. + Typically, you as a designer would like to use specialized UI design tools, + such as Adobe Photoshop, Sketch, Figma, Blender, or Maya, and then send the + design to a developer for functionality implementation. Here you can use the + \QB export tool to convert 2D or 3D assets for \QDS. - You can import the 2D and 3D assets into \QDS for editing before you - submit the UI to the developer for adding the functionality to the + You can import the assets into \QDS. There you can also edit them more if needed. You + can then submit the UI to the developer for adding further functionality to the application. - If you want to make further changes to your components in the design tool, - you can export the UI files back into the metadata format, which you can - then import back into the design tool by using \QB. For example, you could - create components in a design tool and export them to \QDS before you start - making instances of them. In \QDS, you can add functionality to the - components, such as button states and then bring them back to the design - tool as assets. If you use functional \QDS components in the design tool, - you will find it easier to merge new iterations of the design to \QDS and - continue to build the components there. - - The following image describes the workflow using \QBPS and \QDS: + The following image describes the workflow in a basic way using \QBPS and \QDS: \image studio-workflow.png The workflow consists of the following steps: \list 1 - \li Export your design from a design tool into the metadata format. + \li Export your design from a design tool into a metadata + format supported by \QDS. \li \l{Creating Projects}{Create a project} in \QDS and import the metadata file to it. \li Edit the imported components and create more components in @@ -68,9 +57,6 @@ \li Create interactions in \l States and \l {Connections}. \li \l{Validating with Target Hardware}{Preview} your design in real time, on the desktop or on a mobile or an embedded device. - \li Optionally, export your components back into the metadata format - that you can import back into the design tool by using \QB. You - can continue to iterate your design this way until it is ready. \endlist For more information, watch a video that shows how to perform the tasks @@ -87,9 +73,5 @@ Import assets that you exported from design tools to a \QDS project and edit them in the \uicontrol Design mode to create a UI. - \li \l {Exporting Components} - - Export UI files (.ui.qml) back to the metadata format and PNG assets - to generate native file formats in design tools using \QB. \endlist */ From bbf55a881af3d23a5aae5a678bf7a1873cb21844 Mon Sep 17 00:00:00 2001 From: Mats Honkamaa Date: Fri, 7 Oct 2022 09:19:54 +0300 Subject: [PATCH 3/4] Doc: Mention that Translations is part of enterprise license Task-number: QDS-7872 Change-Id: Iff54117d0729411805e2e0f468a2195c5e834cbf Reviewed-by: Leena Miettinen --- doc/qtdesignstudio/src/views/studio-translations.qdoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/qtdesignstudio/src/views/studio-translations.qdoc b/doc/qtdesignstudio/src/views/studio-translations.qdoc index 5d9ee88ab96..0e6f24f94c1 100644 --- a/doc/qtdesignstudio/src/views/studio-translations.qdoc +++ b/doc/qtdesignstudio/src/views/studio-translations.qdoc @@ -30,6 +30,9 @@ \title Translations + The \uicontrol Translations view is included in the + \l{https://www.qt.io/pricing}{Qt Design Studio Enterprise license}. + You handle translations and multi-language support in the \uicontrol {Translations} view. From 1462258939c4c98bf5d480a9cc1dfc70fbafa954 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 10 Oct 2022 10:01:26 +0200 Subject: [PATCH 4/4] AutoTest: Avoid crash Do not emit sizeHintChanged() on a QModelIndex that is no more part of the model. Fixes: QTCREATORBUG-28269 Change-Id: I1fa1733961eff8b427a9510243d304565cefe380 Reviewed-by: Eike Ziller --- src/plugins/autotest/testresultdelegate.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/autotest/testresultdelegate.cpp b/src/plugins/autotest/testresultdelegate.cpp index 9d123bbad86..161857ca9d8 100644 --- a/src/plugins/autotest/testresultdelegate.cpp +++ b/src/plugins/autotest/testresultdelegate.cpp @@ -181,8 +181,12 @@ void TestResultDelegate::clearCache() m_lastProcessedIndex = QModelIndex(); m_lastProcessedFont = QFont(); m_lastWidth = -1; - if (current.isValid()) - emit sizeHintChanged(current); + if (current.isValid()) { + if (auto model = current.model()) { + if (model->index(current.row(), current.column(), current.parent()) == current) + emit sizeHintChanged(current); + } + } } void TestResultDelegate::limitTextOutput(QString &output) const