diff --git a/doc/qtcreator/src/mcu/qtquick-mcu-support.qdocinc b/doc/qtcreator/src/mcu/qtquick-mcu-support.qdocinc index 4501225ae4d..0b2bef414a4 100644 --- a/doc/qtcreator/src/mcu/qtquick-mcu-support.qdocinc +++ b/doc/qtcreator/src/mcu/qtquick-mcu-support.qdocinc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -35,8 +35,8 @@ the time of writing. To develop for MCUs, \l{Using Project Wizards}{create an MCU project}. Only - the components available on MCUs are displayed in \l Library > - \uicontrol Components. Only a subset of properties is supported for the + the components available on MCUs are displayed in \l Components. Only a + subset of properties is supported for the supported components. The properties that are not available on MCUs are marked in the \l Properties view with strikethrough text. diff --git a/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc b/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc index 85f7c0135be..8e1edccd53c 100644 --- a/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -48,7 +48,7 @@ To create a QML module \if defined(qtdesignstudio) - and make it appear in the \l Library view: + and make it appear in the \l Components view: \else : \endif @@ -77,8 +77,8 @@ \li Create a \c .metainfo file for your module and place it in the \c designer directory. \if defined(qtdesignstudio) - Meta information is needed to display the - components in the \uicontrol Components tab in \uicontrol Library. + Meta information is needed to display the components in + \uicontrol Components. \endif Use a metainfo file delivered with Qt, such as \c qtquickcontrols2.metainfo, as an example. @@ -92,9 +92,9 @@ For more information, see \l {Running QML Modules in Design Mode}. \endlist - Your module should now appear in the \uicontrol Components tab in - \uicontrol Library. Your components should appear in a subsection of - the \uicontrol Components tab if a valid \c .metainfo file is in place. + Your module should now appear in \uicontrol Components. Your components + should appear in a subsection of \uicontrol Components if a valid + \c .metainfo file is in place. \endif \if defined(qtcreator) diff --git a/doc/qtdesignstudio/examples/doc/loginui1.qdoc b/doc/qtdesignstudio/examples/doc/loginui1.qdoc index 05c2b9119a6..1db0c6107bc 100644 --- a/doc/qtdesignstudio/examples/doc/loginui1.qdoc +++ b/doc/qtdesignstudio/examples/doc/loginui1.qdoc @@ -182,7 +182,7 @@ \list 1 \li Drag-and-drop the background image from \uicontrol Assets to the rectangle in \l Navigator. - \image loginui1-library-assets.jpg "Library view Assets tab" + \image loginui1-library-assets.jpg "Assets view" \li \QDS automatically creates an instance of the \l{Images}{Image} component for you with the path to the image file set as the value of \l Properties > \uicontrol Image > \uicontrol Source. @@ -409,7 +409,7 @@ \li Drag-and-drop two instances of the EntryField component from \uicontrol Components > \uicontrol {My Components} to the rectangle in \uicontrol Navigator. - \image loginui1-library.jpg "My Components tab of Library view" + \image loginui1-library.jpg "My Components tab of Components view" \li Select the first EntryField instance in \uicontrol Navigator to modify its ID and text in \uicontrol Properties. \li In \uicontrol Component > \uicontrol ID, enter \e username. diff --git a/doc/qtdesignstudio/src/components/qtquick-components.qdoc b/doc/qtdesignstudio/src/components/qtquick-components.qdoc index fa7cab4471f..7ea137592ac 100644 --- a/doc/qtdesignstudio/src/components/qtquick-components.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-components.qdoc @@ -62,7 +62,7 @@ add the relevant modules to your project, as described in \l {Adding and Removing Modules}. - \image qtquick-components-tab.png "Components in Library" + \image qtquick-components-tab.png "Components" Read more about components: diff --git a/doc/qtdesignstudio/src/components/qtquick-controls.qdoc b/doc/qtdesignstudio/src/components/qtquick-controls.qdoc index 7917d1003b1..9faf9b85c95 100644 --- a/doc/qtdesignstudio/src/components/qtquick-controls.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-controls.qdoc @@ -35,7 +35,7 @@ available in \uicontrol Components > \uicontrol {Qt Quick Controls} > \uicontrol Controls. - \image qtquick-designer-qtquickcontrols-types.png "Qt Quick Controls components in Library" + \image qtquick-designer-qtquickcontrols-types.png "Qt Quick Controls components" The following types of controls are available for user interaction: diff --git a/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc index cc22fff5b2a..dba4def7753 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc @@ -186,7 +186,7 @@ flow items that you attach the components to are listed under \uicontrol {My Components}. - \image studio-flow-item.png "Custom Flow Item in Library" + \image studio-flow-item.png "Custom Flow Item in Components" \note You must use the wizard to create the flow items. After you create a flow view, the \uicontrol {Flow View} module is added to diff --git a/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc b/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc index 17701d3328b..aeb92918d63 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc +++ b/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc @@ -65,7 +65,7 @@ \uicontrol {Files and Classes} > \uicontrol {Qt Quick Controls}. \li Select the control to create, and then select \uicontrol Choose. - \note Components are listed in \l Library > \uicontrol Components > + \note Components are listed in \l Components > \uicontrol {My Components} only if the filename begins with a capital letter. \li Edit component properties in the \l Properties view. diff --git a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc index 770a5750309..54308617bd6 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc @@ -52,7 +52,7 @@ An \e asset is an image, font file, 3D model, or other supported file that you add to your \l{glossary-project}{project}. - \image qtquick-assets-tab.png "Assets in Library" + \image qtquick-assets-tab.png "Assets" Assets are packaged with \l{glossary-component}{components} for delivery to users. @@ -100,7 +100,7 @@ creating instances of them. These are similar to \e Symbols in Sketch or \e Prefab in Unity. - \image qtquick-components-tab.png "Preset components in Library" + \image qtquick-components-tab.png "Preset components in Components" Some of the \l {Component Types}{preset components} represent simple shapes, text, or images, while others represent complex UI controls with full diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc index 4d4a87ff62d..352a90ebd0d 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc @@ -179,7 +179,7 @@ \image exporting-from-qt3ds/11-import.png "Import the file" \li The 2D assets imported from \Q3DS now appear in > \uicontrol Assets. - \image exporting-from-qt3ds/12-imported-image-assets.png "Imported assets in Library" + \image exporting-from-qt3ds/12-imported-image-assets.png "Imported assets in Components" \li The QML components generated from the imported \Q3DS project now appear as available imports in \uicontrol Components under \uicontrol {QML Types}. @@ -189,7 +189,7 @@ \li The imported QML types now appear in \uicontrol Components and can be added to the project. - \image exporting-from-qt3ds/14-add-myowncluster-to-project.png "MyOwnCluster in Library" + \image exporting-from-qt3ds/14-add-myowncluster-to-project.png "MyOwnCluster in Components" \endlist \section2 Adding Components to the Project diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc index ba1ccd63d8b..b89178dedc4 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc @@ -38,7 +38,7 @@ scene, it can be used to direct what is displayed in a \l {3D Views} {3D view}. - \image studio-qtquick-3d-components.png "Qt Quick 3D components in Library" + \image studio-qtquick-3d-components.png "Qt Quick 3D components in Components" Add a camera by dragging-and-dropping one of the camera components from \uicontrol Components > \uicontrol {Qt Quick 3D} > \uicontrol diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-shaders.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-shaders.qdoc index f2876bc2e9e..04d8377733d 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-shaders.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-shaders.qdoc @@ -47,13 +47,13 @@ of the components can be found in different locations in \uicontrol {Components}. - \image studio-qtquick-3d-shader-utilities.png "Custom shader utilities in Library" + \image studio-qtquick-3d-shader-utilities.png "Custom shader utilities in Components" You can find additional shader utilities, the \uicontrol Effect and \uicontrol {Custom Material} components, in \uicontrol Components > \uicontrol {Qt Quick3D} > \uicontrol {Qt Quick 3D}. - \image studio-qtquick-3d-components.png "Effect and Custom Material Components in Library" + \image studio-qtquick-3d-components.png "Effect and Custom Material Components in Components" \note In Qt 5 the \uicontrol Effect component is located in \uicontrol {Qt Quick 3D Effects} > diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc index 0eab531185d..1ae6c4551aa 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc @@ -48,7 +48,7 @@ \uicontrol QtQuick3D module to your project, as described in \l {Adding and Removing Modules}. - \image studio-qtquick-3d-components.png "The Qt Quick 3D section in Library" + \image studio-qtquick-3d-components.png "The Qt Quick 3D section in Components" \section1 Model Properties diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-particles.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-particles.qdoc index 7cb2b000243..e3561b33346 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-particles.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-particles.qdoc @@ -118,7 +118,7 @@ \li An image of smoke: \e smoke_01.png \endlist - \image studio-3d-particles-fire-assets.png "The assets in Library" + \image studio-3d-particles-fire-assets.png "The assets in Assets" We will also need instances of the following components: diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc index 04c076b6df9..9bfdc5fc511 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc @@ -44,7 +44,7 @@ \uicontrol {Qt Quick 3D} module to \uicontrol {Components}, as described in \l {Adding and Removing Modules}. - \image studio-qtquick-3d-components.png "Qt Quick 3D components in Library" + \image studio-qtquick-3d-components.png "Qt Quick 3D components in Components" You can now drag-and-drop a \uicontrol View3D component to \l Navigator or to \l {Form Editor}. diff --git a/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-logic-helpers.qdoc b/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-logic-helpers.qdoc index 9eb02c0aeb1..967edc9dbbe 100644 --- a/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-logic-helpers.qdoc +++ b/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-logic-helpers.qdoc @@ -35,7 +35,7 @@ To make this easier, \QDS provides a set of components called \e {logic helpers}. - \image studio-logic-helpers.png "Logic Helper component in Library" + \image studio-logic-helpers.png "Logic Helper component in Components" Logic helpers are available for binding property values using the boolean AND, NOT, and OR operators, as well as for mapping numbers and numerical diff --git a/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-visual-effects.qdoc b/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-visual-effects.qdoc index b36d9e7af96..1b3e004d2d1 100644 --- a/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-visual-effects.qdoc +++ b/doc/qtdesignstudio/src/qtquickdesigner-components/qtdesignstudio-visual-effects.qdoc @@ -34,7 +34,7 @@ dragging-and-dropping them from \uicontrol Components > \uicontrol {Qt Quick Studio Effects} to the component in \l Navigator. - \image studio-2d-effects.png "Effects tab in Library" + \image studio-2d-effects.png "Effects tab in Components" \note The availability of effects depends on whether you selected \uicontrol {Qt 5} or \uicontrol {Qt 6} when \l{Creating Projects} diff --git a/doc/qtdesignstudio/src/views/qtquick-components-view.qdoc b/doc/qtdesignstudio/src/views/qtquick-components-view.qdoc index bc955c7d9fd..464926ea351 100644 --- a/doc/qtdesignstudio/src/views/qtquick-components-view.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-components-view.qdoc @@ -32,7 +32,7 @@ The \uicontrol Component view lists the available components. - \image qtquick-components-tab.png "Library view Components tab" + \image qtquick-components-tab.png "Components view" \uicontrol Components displays modules that have been added to your project. In many modules the components have been further