diff options
-rw-r--r-- | doc/qtcreator/src/qtquick/qtquick-components.qdoc | 6 | ||||
-rw-r--r-- | doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc | 26 |
2 files changed, 18 insertions, 14 deletions
diff --git a/doc/qtcreator/src/qtquick/qtquick-components.qdoc b/doc/qtcreator/src/qtquick/qtquick-components.qdoc index cbba247ad0..b17234a1da 100644 --- a/doc/qtcreator/src/qtquick/qtquick-components.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-components.qdoc @@ -83,9 +83,9 @@ \list 1 \li Drag-and-drop components from \uicontrol Library (1) to - \uicontrol Navigator (2), \uicontrol {Form Editor} (3), or - \l {3D Editor} (4). This creates instances of the components in the - current component file. + \l Navigator (2), \l {Form Editor} (3), or \l {3D Editor} (4). + This creates instances of the components in the current + component file. \li Select component instances in \uicontrol Navigator to edit the values of their properties in \uicontrol Properties. \image qmldesigner-properties-view.png "Properties view" diff --git a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc index b4297871ab..82cc0e6905 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc @@ -58,27 +58,31 @@ A \e component is a reusable building block for a UI. - \QDS comes with \e {preset components} that you can use in your project. - These are similar to \e Symbols in Sketch or \e Prefab in Unity. + \QDS comes with \e {preset components} that you can use in your UI by + creating instances of them. These are similar to \e Symbols in Sketch or + \e Prefab in Unity. - Some of the preset components represent simple shapes, text, or images, - while others represent complex UI controls with full functionality, such - as spin boxes or sliders. + Some of the \l {Component Types}{preset components} represent simple shapes, + text, or images, while others represent complex UI controls with full + functionality, such as spin boxes or sliders. You can also add instances of + preset \l {Using 3D Components}{3D components} to your UIs. You can find all + the preset components in \l Library. - You can modify the \e properties of the preset components and combine them - to build your own components. + To build \l {Creating Component Instances}{your own components}, you can + modify the \e properties of the component instances and combine them. A component is specified within one file (with the file extension \e ui.qml or \e .qml). For example, a Button component may be defined in Button.ui.qml. Typically, the visual appearance of a component is - defined in a \e {UI file}. + defined in a \e {UI file}. To create component files, you can use + \l{Creating Components from Scratch}{wizard templates}, or + \l{Moving Component Instances into Separate Files} + {move component instances into separate component files}. Read more about components: \list - \li \l{Creating Components}{Library} - \li \l{Component Types}{Preset Components} - \li \l{Creating Component Instances}{My Components} + \li \l{Creating Components} \endlist \section1 Device |