diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-01-12 09:07:27 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-01-12 09:07:27 +0100 |
| commit | 211d6507c338f63ebcf1ed58a3206c565bc6cb5c (patch) | |
| tree | c1ba641cdb143b0f8696f847c7cc5834376e570c /doc/qtdesignstudio | |
| parent | 69a79010d6eecb9411385ba4000dd0d088963c54 (diff) | |
| parent | a61f8b02d30d2dfd8716e2ed7b7a23d287b68677 (diff) | |
| download | qt-creator-211d6507c338f63ebcf1ed58a3206c565bc6cb5c.tar.gz | |
Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
src/plugins/updateinfo/updateinfoplugin.cpp
Change-Id: Ie1bf2ad434f0224fb91caf91b443daae3d5b5ec0
Diffstat (limited to 'doc/qtdesignstudio')
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-xd-using.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-xd-using.qdoc index 6faef0cfc8..f4728fa415 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-xd-using.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-xd-using.qdoc @@ -84,7 +84,7 @@ \list \li \uicontrol Component exports the layer as a separate UI file that contains all the exportable artwork and text in it. Only - Artboards can be exported as components. + Artboards and XD component layers can be exported as components. \li \uicontrol Child exports each asset of the selected group or layer a separate PNG file, with references to the images in the component file. diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc index f2063e6a05..6d1fbc5bd1 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc @@ -181,7 +181,7 @@ Aside from the size, an area light has the same properties as a directional light. - The image below shows an example on how to light a component with different + The image shows an example on how to light a component with different colors using two different area lights. You can rotate, scale, and move area lights. diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc index 8d001071cb..5f2f53ca96 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc @@ -32,7 +32,7 @@ By default, a directional light and a perspective camera are used in a 3D scene created by using the wizard template mentioned above. To use other light and camera types, select the component in the \uicontrol{3D} or - \uicontrol Navigatorn view and change the type of the component in the \uicontrol + \uicontrol Navigator view and change the type of the component in the \uicontrol Type field in \l Properties. For example, to use a point light, enter \e {PointLight}. |