diff options
Diffstat (limited to 'doc/qtdesignstudio')
63 files changed, 304 insertions, 520 deletions
diff --git a/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc b/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc index 45ab960f7d0..a003d922d47 100644 --- a/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc +++ b/doc/qtdesignstudio/examples/doc/washingMachineUI.qdoc @@ -33,15 +33,15 @@ In addition, all screens contain a small clock component that displays the current time. We implement a \e TimeDate JavaScript object to support this feature on \l{https://doc.qt.io/QtForMCUs/qtul-qmltypes.html} - {Qt for MCUs}, which does not support the \l Date component at the time of + {\QMCU}, which does not support the \l Date component at the time of writing. \section1 Creating an Application for MCUs - We use the \uicontrol {Qt for MCUs Application} project template to create + We use the \uicontrol {\QMCU Application} project template to create an application for MCUs, which support only a subset of the preset \l{glossary-component}{components}. We select \uicontrol File > - \uicontrol {New Project} > \uicontrol {Qt for MCUs Application} > + \uicontrol {New Project} > \uicontrol {\QMCU Application} > \uicontrol Choose, and follow the instructions of the wizard to create our project. @@ -54,16 +54,16 @@ that we can use to configure and build our example application for running it on MCUs. - \note This example has been tested to run using Qt for MCUs versions since + \note This example has been tested to run using \QMCU versions since 1.6. You cannot run it on older versions. Also, at the time of writing, - Qt for MCUs only supports Qt 5. + \QMCU only supports Qt 5. \section1 Creating Screens For this example, we used an external tool to design the UI and then exported and imported our design into \QDS as assets and components using \QB, as instructed in \l{Exporting from Design Tools}. While - exporting, we only picked components supported by Qt for MCUs to use + exporting, we only picked components supported by \QMCU to use for our components. For the button components, we mostly use the \l {basic-image}{Image}, \l Text, and \l {Mouse Area} components. For the screen background, we use the \l {basic-rectangle}{Rectangle} component. @@ -171,7 +171,7 @@ \image washingmachineui-states.png "States view" - In Qt for MCU, states work differently from Qt Quick, and therefore we + In \QMCU, states work differently from Qt Quick, and therefore we sometimes use \c when conditions to determine the state to apply, and sometimes switch states using signals and JavaScript expressions. @@ -217,7 +217,7 @@ \section1 Showing the Current Time - The \l Date component is not supported on Qt for MCUs, and the + The \l Date component is not supported on \QMCU, and the \l{https://doc.qt.io/QtForMCUs/qtul-javascript-environment.html} {implementation of the JavaScript \c Date()} object returns elapsed time since when the application was started instead of the current diff --git a/doc/qtdesignstudio/images/baked-lightmaps-add-property.png b/doc/qtdesignstudio/images/baked-lightmaps-add-property.png Binary files differnew file mode 100644 index 00000000000..96d4e3e3276 --- /dev/null +++ b/doc/qtdesignstudio/images/baked-lightmaps-add-property.png diff --git a/doc/qtdesignstudio/images/baked-lightmaps-edit-component.png b/doc/qtdesignstudio/images/baked-lightmaps-edit-component.png Binary files differnew file mode 100644 index 00000000000..54ba462e2da --- /dev/null +++ b/doc/qtdesignstudio/images/baked-lightmaps-edit-component.png diff --git a/doc/qtdesignstudio/images/baked-lightmaps-exit-component.png b/doc/qtdesignstudio/images/baked-lightmaps-exit-component.png Binary files differnew file mode 100644 index 00000000000..58b5893bed2 --- /dev/null +++ b/doc/qtdesignstudio/images/baked-lightmaps-exit-component.png diff --git a/doc/qtdesignstudio/images/baked-lightmaps-navigator-blm.png b/doc/qtdesignstudio/images/baked-lightmaps-navigator-blm.png Binary files differnew file mode 100644 index 00000000000..1fe50f46a27 --- /dev/null +++ b/doc/qtdesignstudio/images/baked-lightmaps-navigator-blm.png diff --git a/doc/qtdesignstudio/images/baked-lightmaps-navigator.png b/doc/qtdesignstudio/images/baked-lightmaps-navigator.png Binary files differnew file mode 100644 index 00000000000..a6fac65a00d --- /dev/null +++ b/doc/qtdesignstudio/images/baked-lightmaps-navigator.png diff --git a/doc/qtdesignstudio/images/baked-lightmaps-property-value.png b/doc/qtdesignstudio/images/baked-lightmaps-property-value.png Binary files differnew file mode 100644 index 00000000000..69a5fd3a82a --- /dev/null +++ b/doc/qtdesignstudio/images/baked-lightmaps-property-value.png diff --git a/doc/qtdesignstudio/images/qds-mcu-target-deployment.png b/doc/qtdesignstudio/images/qds-mcu-target-deployment.png Binary files differnew file mode 100644 index 00000000000..456a75560a7 --- /dev/null +++ b/doc/qtdesignstudio/images/qds-mcu-target-deployment.png diff --git a/doc/qtdesignstudio/src/components/qtquick-animation-types.qdoc b/doc/qtdesignstudio/src/components/qtquick-animation-types.qdoc index f51b3d376ac..a8bddc66ff8 100644 --- a/doc/qtdesignstudio/src/components/qtquick-animation-types.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-animation-types.qdoc @@ -3,11 +3,8 @@ /*! \page quick-animations.html - \if defined(qtdesignstudio) + \previouspage quick-logic-helpers.html - \else - \previouspage quick-data-models.html - \endif \nextpage studio-3d-view.html \title Animations @@ -72,10 +69,8 @@ \image qtquick-number-animation.gif "Number animation" - \if defined(qtdesignstudio) For an example of using property animation to animate the scale and opacity of components, see the \l{Coffee Machine} example. - \endif \section2 Setting Non-Animated Properties diff --git a/doc/qtdesignstudio/src/components/qtquick-buttons.qdoc b/doc/qtdesignstudio/src/components/qtquick-buttons.qdoc index d2a1a1760dd..071cf04554b 100644 --- a/doc/qtdesignstudio/src/components/qtquick-buttons.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-buttons.qdoc @@ -19,11 +19,7 @@ \list 1 \li Select \uicontrol File > \uicontrol {New File} > - \if defined(qtcreator) - \uicontrol Qt > \uicontrol {Qt Quick UI File} > - \else \uicontrol {Qt Quick Files} > \uicontrol {Qt Quick UI File} > - \endif \uicontrol Choose to create a \l{UI Files}{UI file} called Button.ui.qml (for example). @@ -105,11 +101,7 @@ /*! \previouspage quick-buttons.html \page quick-scalable-image.html - \if defined(qtdesignstudio) \nextpage qtquick-properties.html - \else - \nextpage studio-optimized-3d-scenes.html - \endif \title Creating Scalable Buttons and Borders @@ -136,11 +128,8 @@ To create a button component, select \uicontrol File > \uicontrol {New File} > - \if defined(qtcreator) - \uicontrol Qt > \uicontrol {Qt Quick UI File} > - \else \uicontrol {Qt Quick Files} > \uicontrol {Qt Quick UI File} > - \endif + \uicontrol Choose to create a \l{UI Files}{UI file} called Button.ui.qml (for example). diff --git a/doc/qtdesignstudio/src/components/qtquick-component-context-menu.qdocinc b/doc/qtdesignstudio/src/components/qtquick-component-context-menu.qdocinc index 1d6b1cd08a7..34140b88947 100644 --- a/doc/qtdesignstudio/src/components/qtquick-component-context-menu.qdocinc +++ b/doc/qtdesignstudio/src/components/qtquick-component-context-menu.qdocinc @@ -22,11 +22,9 @@ \row \li Anchors \li \l{Setting Anchors and Margins} - \if defined(qtdesignstudio) \row \li Group \li \l{Organizing Components} - \endif \row \li Position \li \l{Using Positioners} @@ -39,11 +37,9 @@ \row \li Timeline \li \l{Creating a Timeline} - \if defined(qtdesignstudio) \row \li Event List \li \l{Simulating Events} - \endif \row \li Edit Color \li \l{Editing Properties Inline} diff --git a/doc/qtdesignstudio/src/components/qtquick-components-custom.qdoc b/doc/qtdesignstudio/src/components/qtquick-components-custom.qdoc index 7d394de29e8..fc6ccdcf3cb 100644 --- a/doc/qtdesignstudio/src/components/qtquick-components-custom.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-components-custom.qdoc @@ -26,11 +26,7 @@ \list 1 \li Select \uicontrol File > \uicontrol {New File} > - \if defined(qtcreator) - \uicontrol Qt > \uicontrol {Qt Quick UI File} > - \else \uicontrol {Qt Quick Files} > \uicontrol {Qt Quick UI File} > - \endif \uicontrol Choose to create a new \c .ui.qml file. \note Components are listed in \uicontrol Components > \uicontrol {My Components} only if the filename begins with a @@ -80,9 +76,7 @@ that screen. For example, \e myButton_myMenu_home, \e myButton_myMenu_profile, and \e myButton_myMenu_settings - \if defined(qtdesignstudio) \include qtdesignstudio-components.qdocinc creating studio components - \endif \section1 Turning Component Instances into Custom Components @@ -107,11 +101,7 @@ additional ways of opening base components, see \l{Moving Within Components}. For an example of creating a reusable custom component, see - \if defined(qtcreator) - \l{Creating a Mobile Application}. - \else \l{Progress Bar}. - \endif Custom components are listed in \uicontrol Components > \uicontrol {My Components}, and you can use instances of them to build diff --git a/doc/qtdesignstudio/src/components/qtquick-components.qdoc b/doc/qtdesignstudio/src/components/qtquick-components.qdoc index 092a8bea3b1..edd28485db3 100644 --- a/doc/qtdesignstudio/src/components/qtquick-components.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-components.qdoc @@ -3,11 +3,7 @@ /*! \page quick-components.html - \if defined(qtdesignstudio) \previouspage studio-flow-external-events.html - \else - \previouspage creator-using-qt-quick-designer.html - \endif \nextpage quick-preset-components.html \title Using Components diff --git a/doc/qtdesignstudio/src/components/qtquick-controls.qdoc b/doc/qtdesignstudio/src/components/qtquick-controls.qdoc index abcdde5e5b0..15b2189d2ac 100644 --- a/doc/qtdesignstudio/src/components/qtquick-controls.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-controls.qdoc @@ -94,12 +94,10 @@ \image qtquickcontrols2-button.gif "Qt Quick Controls - Button" - \if defined(qtdesignstudio) Alternatively, you can use a wizard to create a \l{Creating Custom Controls} {custom button}: \image studio-custom-button.gif "Custom button" - \endif A button can be pushed or clicked by users. Typically, buttons are used to perform an action or to answer a question. For example, \e OK, @@ -133,14 +131,12 @@ \image qtquickcontrols2-button-flat.gif "Flat button" - \if defined(qtdesignstudio) \section3 Icon Buttons To create a button that contains an icon, use the wizard template to \l{Creating Custom Controls}{create a custom button} and drag-and-drop the icon to the button background component. For an example of using the wizard template, see \l{Creating a Push Button}. - \endif \section2 Delay Button @@ -162,12 +158,10 @@ \image qtquickcontrols2-checkbox.gif "Check boxes" - \if defined(qtdesignstudio) Alternatively, you can use a wizard to create \l{Creating Custom Controls} {custom check boxes}: \image studio-custom-check-box.gif "Custom check boxes" - \endif A check box presents an option button that can be toggled on (checked) or off (unchecked). Check boxes are typically used to select @@ -255,12 +249,10 @@ \image qtquickcontrols2-switch.gif "Switch" - \if defined(qtdesignstudio) Alternatively, you can use a wizard to create a \l{Creating Custom Controls} {custom switch}: \image studio-custom-switch.gif "Custom switch" - \endif A switch is an option button that can be dragged or toggled on (checked) or off (unchecked). Switches are typically used to select between @@ -441,12 +433,10 @@ \image qtquickcontrols2-slider.gif "Slider" - \if defined(qtdesignstudio) Alternatively, you can use a wizard to create a \l{Creating Custom Controls} {custom slider}: \image studio-custom-slider.gif "Custom slider" - \endif A slider is used to select a value by sliding a handle along a track, whereas \uicontrol {Range Slider} is used to select a range @@ -463,12 +453,10 @@ \image qtquickcontrols2-dial-no-wrap.gif "Dial" - \if defined(qtdesignstudio) Alternatively, you can use a wizard to create a \l{Creating Custom Controls} {custom dial}: \image studio-custom-dial.gif "Custom dial" - \endif In the \uicontrol From and \uicontrol To fields, set the range of the slider or dial. Set the value of the slide handle or dial in the @@ -514,12 +502,10 @@ \image qtquickcontrols2-spinbox.png "Spin Box" - \if defined(qtdesignstudio) Alternatively, you can use a wizard to create a \l{Creating Custom Controls} {custom spin box}: \image studio-custom-spinbox.gif "Custom spin box" - \endif A spin box enables users to choose an integer value by clicking the up or down indicator buttons, or by pressing up or down on the keyboard. @@ -661,31 +647,6 @@ For more information about how to customize a particular control, see \l{Customization Reference}. - \if defined(qtcreator) - \section1 History of Qt Quick Controls - - In Qt 4, ready-made Qt Quick 1 Components were provided for creating - UIs with a native look and feel for a particular target platform. - In Qt 5.1, Qt Quick Controls, Dialogs, and Layouts were added for - creating classic desktop-style user interfaces using Qt Quick 2.1. The - Qt Quick Controls Styles could be used to customize Qt Quick Controls. - - Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and - Qt Labs Controls. They provide lightweight components for creating performant - user interfaces for \l{glossary-device}{devices}. - - Qt Quick Controls 2 work in conjunction with Qt Quick and Qt Quick Layouts. - - The \QC project wizards create Qt Quick applications that use Qt Quick - 2 types or Qt Quick Controls 2 types. - - Even if you use Qt Quick Controls 2, you can still write cross-platform - applications, by using different sets of QML files for each platform. - - Some ready-made controls, such as a gauge, dial, status indicator, and - tumbler, are provided by the \l {Qt Quick Extras} module. - \endif - \section1 Summary of UI Controls The following table lists preset UI controls with links to their developer diff --git a/doc/qtdesignstudio/src/components/qtquick-data-models.qdoc b/doc/qtdesignstudio/src/components/qtquick-data-models.qdoc index 6ecd695a2e7..400e264d02e 100644 --- a/doc/qtdesignstudio/src/components/qtquick-data-models.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-data-models.qdoc @@ -4,11 +4,7 @@ /*! \page quick-data-models.html \previouspage quick-controls.html - \if defined(qtdesignstudio) \nextpage quick-2d-effects.html - \else - \nextpage quick-animations.html - \endif \title Lists and Other Data Models @@ -167,9 +163,7 @@ > \uicontrol {Qt Quick Controls}. \include qtquick-pathview-editor.qdocinc pathview - \if defined(qtdesignstudio) \include qtquick-pathview-editor.qdocinc svgpath - \endif \section1 Summary of Model Components @@ -223,14 +217,12 @@ \li Qt Quick Controls \li \li A stack-based navigation model. - \if defined(qtdesignstudio) \row \li \inlineimage icons/item-svg-16px.png \li \l{SVG Path Item} \li Qt Quick Studio Components \li \li An SVG path data string that is used to draw a path as a line. - \endif \row \li \inlineimage icons/itemdelegate-icon16.png \li \l{SwipeDelegate}{Swipe Delegate} diff --git a/doc/qtdesignstudio/src/components/qtquick-images.qdoc b/doc/qtdesignstudio/src/components/qtquick-images.qdoc index 3d6879826c5..176e4409f8a 100644 --- a/doc/qtdesignstudio/src/components/qtquick-images.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-images.qdoc @@ -187,7 +187,6 @@ \youtube DVWd_xMMgvg - \if defined(qtdesignstudio) \section1 Iso Icon \note The Iso Icon component is not available if you selected @@ -207,7 +206,6 @@ set the value of \uicontrol {Icon color}. \image iso-icon-browser.png - \endif \section1 Summary of Images @@ -243,7 +241,6 @@ \li \inlineimage ok.png \li An image in one of the supported formats, including bitmap formats such as PNG and JPEG and vector graphics formats such as SVG. - \if defined(qtdesignstudio) \row \li \inlineimage icons/iso-icons-16px.png \li \l{Iso Icon} @@ -253,6 +250,5 @@ component. You can select the icon to use and its color. \note This component is not supported on Qt 6. - \endif \endtable */ diff --git a/doc/qtdesignstudio/src/components/qtquick-mcu-support.qdocinc b/doc/qtdesignstudio/src/components/qtquick-mcu-support.qdocinc index e01af788b80..edd75e3a467 100644 --- a/doc/qtdesignstudio/src/components/qtquick-mcu-support.qdocinc +++ b/doc/qtdesignstudio/src/components/qtquick-mcu-support.qdocinc @@ -6,9 +6,9 @@ \section1 Creating UIs for MCUs - \l{Qt for MCUs} enables you to use subsets of components to create UIs for + \l{\QMCU} enables you to use subsets of components to create UIs for devices that are powered by microcontroller units (MCU). The subset of - supported components depends on the Qt for MCUs version that you use for + supported components depends on the \QMCU version that you use for development. In this manual, we indicate which components are supported at the time of writing. @@ -21,7 +21,7 @@ \image qmldesigner-mcu-support.png "Components and Text properties supported for MCUs" For more information about the supported components and their properties, - see \l{Qt for MCUs - All QML Types}. + see \l{\QMCU - All QML Types}. //! [mcu qtquick components] */ diff --git a/doc/qtdesignstudio/src/components/qtquick-pathview-editor.qdocinc b/doc/qtdesignstudio/src/components/qtquick-pathview-editor.qdocinc index 73422f6676b..dd50cf67986 100644 --- a/doc/qtdesignstudio/src/components/qtquick-pathview-editor.qdocinc +++ b/doc/qtdesignstudio/src/components/qtquick-pathview-editor.qdocinc @@ -49,10 +49,8 @@ In the \uicontrol {Path View Highlight} section, you can specify properties for \l{View Highlight}{highlighting} path objects. - \if defined(qtdesignstudio) \note You can also use the \l {SVG Path Item} Studio Component to specify an SVG path data string that draws a path. - \endif //! [pathview] diff --git a/doc/qtdesignstudio/src/components/qtquick-positioning.qdoc b/doc/qtdesignstudio/src/components/qtquick-positioning.qdoc index a71831fdd1e..1eb55ebd771 100644 --- a/doc/qtdesignstudio/src/components/qtquick-positioning.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-positioning.qdoc @@ -4,11 +4,7 @@ /*! \page qtquick-positioning.html \previouspage qtquick-properties.html - \if defined(qtdesignstudio) \nextpage qtquick-annotations.html - \else - \nextpage qtquick-fonts.html - \endif \title Scalable Layouts @@ -386,13 +382,9 @@ \section2 Using Layouts - \if defined(qtcreator) - Since Qt 5.1, you can use QML types in the \l{qtquicklayouts-index.html} - {Qt Quick Layouts} module to arrange components in UIs. - \else You can use the components available in \uicontrol Components > \uicontrol {Qt Quick Layouts} to arrange components in UIs. - \endif + Unlike positioners, layouts manage both the positions and sizes of their child components, and are therefore well suited for dynamic and resizable UIs. However, this means that you should not specify fixed positions and @@ -502,10 +494,8 @@ You can use the \uicontrol Frame and \uicontrol {Group Box} controls to draw frames around groups of controls. - \if defined(qtdesignstudio) - If you don't want a frame, use the \uicontrol Group component instead. - \endif + If you don't want a frame, use the \uicontrol Group component instead. The following table lists the UI controls that you can use to organize components in UIs (since Qt 5.7). The \e Location column indicates the @@ -522,13 +512,11 @@ \li \l [QtQuickControls]{Frame} \li Qt Quick Controls \li A visual frame around a group of controls. - \if defined(qtdesignstudio) \row \li \inlineimage icons/group-16px.png \li Group \li Qt Quick Studio Components \li Enables handling the selected components as a group. - \endif \row \li \inlineimage icons/groupbox-icon16.png \li \l [QtQuickControls]{GroupBox}{Group Box} diff --git a/doc/qtdesignstudio/src/components/qtquick-preset-components.qdoc b/doc/qtdesignstudio/src/components/qtquick-preset-components.qdoc index d05d800546a..875d0f9ea67 100644 --- a/doc/qtdesignstudio/src/components/qtquick-preset-components.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-preset-components.qdoc @@ -30,10 +30,8 @@ \li \l {User Interaction Methods} \li \l {UI Controls} \li \l {Lists and Other Data Models} - \if defined(qtdesignstudio) \li \l {2D Effects} \li \l {Logic Helpers} - \endif \li \l Animations \endlist diff --git a/doc/qtdesignstudio/src/components/qtquick-shapes.qdoc b/doc/qtdesignstudio/src/components/qtquick-shapes.qdoc index 02ef0e06cf5..73ccc3971a5 100644 --- a/doc/qtdesignstudio/src/components/qtquick-shapes.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-shapes.qdoc @@ -8,7 +8,6 @@ \title Shapes - \if defined(qtdesignstudio) \QDS is a UI design tool rather than a generic drawing tool, and therefore, the focus is on providing ready-made UI controls that you can modify according to your needs. The values of some properties of the controls are @@ -22,12 +21,6 @@ \image studio-shapes.png "Shapes in the 2D view" - \else - You can use the Rectangle component to draw basic shapes in - the \l {2D} view. - \image qml-shapes.png "Shapes in the 2D view" - \endif - Most visual components in \uicontrol Components are based on the \l [QtQuick] {Item} component. Even though it has no visual appearance itself (similarly to a mouse area, for example), it defines all the properties that are @@ -48,9 +41,7 @@ The basic \l [QtQuick] {Rectangle} component is used for drawing shapes with four sides and corners, as well as a solid border. - \if defined(qtdesignstudio) \image qml-shapes-rectangle.png "A rectangle and its properties" - \endif Rectangles can be filled either with a solid fill color or a linear gradient that you set in the \uicontrol {Fill color} field. You can @@ -74,7 +65,6 @@ check box in the \uicontrol Advanced section to improve the appearance of your shape. - \if defined(qtdesignstudio) \target studio-rectangle \section2 Studio Rectangle @@ -279,5 +269,4 @@ \li A triangle with different dimensions and shapes that is enclosed in an invisible rectangle. \endtable - \endif */ diff --git a/doc/qtdesignstudio/src/components/qtquick-text.qdoc b/doc/qtdesignstudio/src/components/qtquick-text.qdoc index 7f515c7e98f..f47ac82d7bd 100644 --- a/doc/qtdesignstudio/src/components/qtquick-text.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-text.qdoc @@ -79,12 +79,6 @@ For more information, see \l {Internationalization and Localization with Qt Quick}. - \if defined(qtcreator) - When you \l{Creating Qt Quick Projects}{create a new project}, you can - automatically generate a translation source file (TS) for one language. - You can add other languages later by editing the project file. - \endif - \section1 Character Properties You can set font properties in the \uicontrol Character section diff --git a/doc/qtdesignstudio/src/components/qtquick-user-interaction-methods.qdoc b/doc/qtdesignstudio/src/components/qtquick-user-interaction-methods.qdoc index bb29fb7f36e..71b3fee6305 100644 --- a/doc/qtdesignstudio/src/components/qtquick-user-interaction-methods.qdoc +++ b/doc/qtdesignstudio/src/components/qtquick-user-interaction-methods.qdoc @@ -59,11 +59,6 @@ \li \c released() \endlist - \if defined(qtcreator) - A more modern way of handling events from all pointing devices, including - mouse and touchscreen, is via \l {Qt Quick Input Handlers}. - \endif - \section2 Mouse Area Properties A \uicontrol {Mouse Area} is an invisible component that is typically used diff --git a/doc/qtdesignstudio/src/mcus/qtdesignstudio-compatibility-with-mcu-sdks.qdoc b/doc/qtdesignstudio/src/mcus/qtdesignstudio-compatibility-with-mcu-sdks.qdoc new file mode 100644 index 00000000000..c6dab76398d --- /dev/null +++ b/doc/qtdesignstudio/src/mcus/qtdesignstudio-compatibility-with-mcu-sdks.qdoc @@ -0,0 +1,29 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + \previouspage studio-on-mcus.html + \page studio-compatibility-with-mcu-sdks.html + \nextpage studio-help.html + + \title \QDS Version Compatibility with \QMCU SDKs + + The following table lists the \QDS versions you can use to develop + applications with particular \QMCU SDK versions. + + \table + \header + \li \QDS Version + \li \QMCU SDK Version + \row + \li 4.0 or later + \li 2.4 or later + \row + \li 3.8 up to 3.9 + \li 2.3 + \row + \li 3.4 up to 3.7 + \li 2.2 (LTS) + \endtable + +*/ diff --git a/doc/qtdesignstudio/src/mcus/qtdesignstudio-on-mcus.qdoc b/doc/qtdesignstudio/src/mcus/qtdesignstudio-on-mcus.qdoc new file mode 100644 index 00000000000..a16df932c91 --- /dev/null +++ b/doc/qtdesignstudio/src/mcus/qtdesignstudio-on-mcus.qdoc @@ -0,0 +1,92 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + \previouspage creator-editor-external.html + \page studio-on-mcus.html + \nextpage studio-compatibility-with-mcu-sdks.html + + \title \QDS on MCUs + + \QMCU is a comprehensive framework that supports various hardware ecosystems + and platforms. One of the most important libraries provided by the \QMCU + framework is \QUL (QUL), a lightweight implementation of the Qt Quick + framework. \QUL provides a QML API and an efficient graphics rendering engine + that has a low memory footprint and is optimized for MCUs and other + resource-constrained devices. + + In addition to a lightweight graphics framework, \QMCU offers a toolkit that + enables you to design, develop, and deploy graphical user interfaces (GUI) + on microcontrollers (MCU). Also, it lets you run the applications either + on BareMetal or a real-time operating system (RTOS). + + For more information on \QMCU, see \l {\QMCU documentation}. + + \section1 Designing application UIs for MCU devices with \QDS + + As a technical artist or a designer you can use specialized UI design tools, + such as Adobe Photoshop, Sketch, Figma, Blender, or Maya to create the + original UI design files for your MCU application. After the initial design + work, export your design from the design tools, and import your 2D and 3D UI + design assets into \QDS, which can convert them into code for developers. + For more information on managing the original assets created with + specialized UI design tools, see \l {Asset Creation with Other Tools}. + + Once your UI design assets are in \QDS, use it to \l {Wireframing} {wireframe} + your MCU application, to visualize its structure. To modify the look and feel + of your UI further, utilize the preset UI components available in \QDS. + + For an example on how to create a UI that runs both on the desktop and + on MCUs, see \l {Washing Machine UI}. For step-by-step instructions on how + to use \QDS to design a UI for a specific MCU target device, see: + + \list + \li \l {Designing a UI for Infineon Traveo II} + \li \l {Designing a UI for NXP i.MX RT1170} + \li \l {Designing a UI for Renesas RA6M3G} + \li \l {Designing a UI for Renesas RH850-D1M1A} + \endlist + + \section1 Developing applications for MCU devices with \QDS + + As a GUI/application developer, use \QDS to bring your designs to life. Add + further functionality to your applications and utilize the \l {Prototyping} + {prototyping} features of \QDS to simulate and validate interactions and + their dynamic behavior. + + You can also test, preview, and fine-tune your designs to pixel-perfection + live on the desktop or on an actual MCU target device. For more information, + see \l {Validating with Target Hardware}. + + \image qds-mcu-target-deployment.png + + \QDS enables designers and developers to work together on common projects to + develop applications. Designers can use the views in the Design mode to modify + UI files (.ui.qml), whereas developers can use Qt Creator to work on the Qt + Quick (.qml) and other files that are needed to implement the application + logic and to prepare the application for production. For more information, + see \l {Implementing Applications}. + + \section1 Connecting MCUs with Qt Creator + + \l {Connecting MCUs} {Connect MCU boards} to a development host to + build applications for them using the GNU Arm Embedded GCC compiler, libraries, + and other GNU tools necessary for BareMetal software development on devices + based on the Arm Cortex-M processors. Deploy the applications on MCUs to run + and debug them using Qt Creator. + + The toolchains are available for cross-compilation on Microsoft Windows, + Linux, and macOS. However, the \QMCU SDK is currently only available for + Windows and Linux. + + For more information on how to manage the complete cycle of developing \QMCU + applications using Qt tools, see: + + \list + \li \l {Infineon Traveo II quick start guide} + \li \l {NXP i.MX RT1170 quick start guide} + \li \l {Renesas EK-RA6M3G quick start guide} + \li \l {Renesas RH850-D1M1A quick start guide} + \endlist + +*/ diff --git a/doc/qtdesignstudio/src/overviews/qtquick-animation-overview.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-animation-overview.qdoc index ef7fccc3c7d..86132b5ce1a 100644 --- a/doc/qtdesignstudio/src/overviews/qtquick-animation-overview.qdoc +++ b/doc/qtdesignstudio/src/overviews/qtquick-animation-overview.qdoc @@ -87,12 +87,10 @@ \header \li Technique \li Use Case - \if defined(qtdesignstudio) \row \li \l{Designing Application Flows}{Application flows} \li An interactive prototype that can be clicked through to simulate the user experience of the application. - \endif \row \li \l{Transitions}{Transitions between states} \li Transitions between different states of the UI using a transition @@ -100,7 +98,6 @@ to the keyframes. \endtable - \if defined(qtdesignstudio) \section2 Application Flows You can design an application in the form of a \e {schematic diagram} @@ -111,7 +108,6 @@ as the base of the production version of the application. For more information, see \l{Designing Application Flows}. - \endif \section2 Transitions Between States diff --git a/doc/qtdesignstudio/src/overviews/qtquick-annotations.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-annotations.qdoc index d5f19de7a45..aeaf304bfcf 100644 --- a/doc/qtdesignstudio/src/overviews/qtquick-annotations.qdoc +++ b/doc/qtdesignstudio/src/overviews/qtquick-annotations.qdoc @@ -3,13 +3,8 @@ /*! \page qtquick-annotations.html - \if defined(qtdesignstudio) \previouspage qtquick-positioning.html \nextpage qtquick-prototyping.html - \else - \previouspage qtquick-fonts.html - \nextpage creator-quick-ui-forms.html - \endif \title Annotating Designs diff --git a/doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc index 226c2a4982d..a5e05f8beb3 100644 --- a/doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc +++ b/doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc @@ -38,13 +38,11 @@ to define how their properties will animate when they change due to a state change. - \if defined(qtdesignstudio) The \l{Log In UI - States} example illustrates using states to create two UI screens and signals emitted by buttons to apply the states. The button components also switch states when they are pressed down. \image loginui3.gif "Clicking buttons to switch between screens" - \endif Using property aliases and states to create the differences in your component instances enables you to reuse components instead of duplicating @@ -57,7 +55,6 @@ instances of the controls into custom components and specify new properties for them. - \if defined(qtdesignstudio) To have your UI perform certain operations, you might need to write JavaScript expressions for conditions or convert numbers to strings. To make this easier, \QDS provides preset components called @@ -74,7 +71,6 @@ to implement the UI logic. \image studio-logic-helper-combining-example.gif "Logic helper example application" - \endif The following table summarizes some typical use cases with links to more information. @@ -107,11 +103,9 @@ \row \li Using preset UI controls that have default properties and states \li \l{UI Controls} - \if defined(qtdesignstudio) \row \li Creating conditional conditions \li \l{Logic Helpers} - \endif \row \li Adding custom properties for a particular component type \li \l{Specifying Custom Properties} diff --git a/doc/qtdesignstudio/src/overviews/qtquick-export.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-export.qdoc index 1d7661fdd34..f9ae3b8d7b4 100644 --- a/doc/qtdesignstudio/src/overviews/qtquick-export.qdoc +++ b/doc/qtdesignstudio/src/overviews/qtquick-export.qdoc @@ -4,7 +4,7 @@ /*! \page creator-exporting-qml.html \previouspage studio-importing-3d.html - \nextpage qt-effect-maker-files.html + \nextpage qt-using-effect-maker-effects.html \title Exporting Components diff --git a/doc/qtdesignstudio/src/overviews/qtquick-fonts.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-fonts.qdoc index e2cfd05679a..d2f6745df5e 100644 --- a/doc/qtdesignstudio/src/overviews/qtquick-fonts.qdoc +++ b/doc/qtdesignstudio/src/overviews/qtquick-fonts.qdoc @@ -3,13 +3,8 @@ /*! \page qtquick-fonts.html - \if defined(qtdesignstudio) \previouspage studio-importing-2d.html \nextpage studio-importing-3d.html - \else - \previouspage qtquick-positioning.html - \nextpage qtquick-annotations.html - \endif \title Using Custom Fonts diff --git a/doc/qtdesignstudio/src/overviews/qtquick-motion-design.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-motion-design.qdoc index aade258132c..70ebb9115dc 100644 --- a/doc/qtdesignstudio/src/overviews/qtquick-motion-design.qdoc +++ b/doc/qtdesignstudio/src/overviews/qtquick-motion-design.qdoc @@ -3,7 +3,7 @@ /*! \page qtquick-motion-design.html - \previouspage qt-effect-maker.html + \previouspage qt-using-effect-maker-effects.html \nextpage quick-animation-overview.html \title Motion Design diff --git a/doc/qtdesignstudio/src/overviews/qtquick-prototyping.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-prototyping.qdoc index 414e608a9c7..2cda8239de4 100644 --- a/doc/qtdesignstudio/src/overviews/qtquick-prototyping.qdoc +++ b/doc/qtdesignstudio/src/overviews/qtquick-prototyping.qdoc @@ -3,11 +3,7 @@ /*! \page qtquick-prototyping.html - \if defined(qtdesignstudio) \previouspage qtquick-annotations.html - \else - \previouspage creator-quick-ui-forms.html - \endif \nextpage qtquick-creating-ui-logic.html \title Prototyping @@ -39,10 +35,8 @@ You can connect UIs to different forms of data from various sources, such as QML-based data models, JavaScript files, and backend services. - \if defined(qtdesignstudio) You can also connect your UI to Simulink to load live data from a Simulink simulation. - \endif \li \l {Dynamic Behaviors} @@ -50,7 +44,6 @@ communicate with each other. The connections can be triggered by changes in component property values or in UI states. - \if defined(qtdesignstudio) \li \l {Validating with Target Hardware} You can use the live preview feature to preview a UI file or the @@ -64,24 +57,5 @@ files that you can import to projects in \QDS, how to import them, and how to export them from \QDS back to the metadata format. - \else - \li \l {Exporting 3D Assets} - - You can export assets from 3D graphics applications into several - widely-used formats, such as .blend, .dae, .fbx, .glb, .gltf, .obj, - .uia, or .uip. - - \li \l {Importing 3D Assets} - - You can import exported assets into \QDS. For a list of formats - supported by each \l{Qt Quick 3D} version, see the module - documentation. - - \li \l {Exporting Components} - - You can export components contained in \l{UI Files}{UI files} - (.ui.qml) to JSON metadata format and PNG assets. - \endif - \endlist */ diff --git a/doc/qtdesignstudio/src/overviews/qtquick-uis.qdoc b/doc/qtdesignstudio/src/overviews/qtquick-uis.qdoc index 59eb00ab94b..82a6f2acfa3 100644 --- a/doc/qtdesignstudio/src/overviews/qtquick-uis.qdoc +++ b/doc/qtdesignstudio/src/overviews/qtquick-uis.qdoc @@ -3,13 +3,8 @@ /*! \page quick-uis.html - \if defined(qtdesignstudio) \previouspage {Examples} \nextpage studio-app-flows.html - \else - \previouspage qtquick-text-editor.html - \nextpage quick-components.html - \endif \title Wireframing @@ -44,7 +39,6 @@ \list - \if defined(qtdesignstudio) \li \l {Designing Application Flows} You can design an application in the form of a \e {schematic diagram} @@ -52,7 +46,6 @@ interconnections by means of symbols. This results in an interactive prototype that can be clicked through to simulate the user experience of the application. - \endif \li \l {Using Components} @@ -79,31 +72,10 @@ methods, such as anchors, layouts, positioners, and property bindings, for dynamic UIs. - \if defined(qtcreator) - \li \l {Using Custom Fonts} - - You can load custom fonts to \QC and use them in your designs. - \endif - \li \l {Annotating Designs} You can annotate your designs to provide reviewers or developers with additional information about them. - \if defined(qtcreator) - \li \l {Loading Placeholder Data} - - You can create QML files that contain placeholder data, so that - you can test grid, list, or path views, even though you don't - have access to real data. - - \li \l{UI Files} - - Some of the wizards create projects that contain UI files - (.ui.qml). You should always edit UI files in the \l {2D} - and \l Properties view, to avoid breaking the code. - - \endif - \endlist */ diff --git a/doc/qtdesignstudio/src/qt-quick-effect-maker.qdoc b/doc/qtdesignstudio/src/qt-quick-effect-maker.qdoc deleted file mode 100644 index 56dfebfe301..00000000000 --- a/doc/qtdesignstudio/src/qt-quick-effect-maker.qdoc +++ /dev/null @@ -1,93 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Design Studio documentation. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** -****************************************************************************/ - -/*! - - \page qt-effect-maker.html - \previouspage qt-effect-maker-files.html - \nextpage qtquick-motion-design.html - \sa {Creating Qt Quick Effect Maker Files} - - \title Working with Effects in Qt Quick Effect Maker - - The Qt Quick Effect Maker is a tool to create high-performance - shader effects for Qt Quick. - - You can import these effects to \QDS and you can run Qt Quick Effect Maker - from \QDS. - - \section1 Creating Effects - - When you run Qt Quick Effect Maker, it starts with an empty project. To - create your effect, add nodes to the node tree. - - \image qt-quick-effect-maker.webp - - Consider the following things when creating effects: - - \list - \li Some nodes do not function alone, they need a helper node. For - example, the \uicontrol FastBlur node needs a \uicontrol BlurHelper node - and the \uicontrol Noise node needs a \uicontrol NoiseHelper node. If the - node needs another node, it is mentioned in the node description. - \li If your effect appears cropped, you need to go to \uicontrol Edit > - \uicontrol {Project Settings} and increase the item padding. - \endlist - - \section2 Creating a Blur Effect - - To create a blur effect: - - \list 1 - \li Add a \uicontrol FastBlur node to the node tree. - \li Add a \uicontrol BlurHelper node to the node tree. You need the - \uicontrol BlurHelper node for all effects that contains a blur effect. - \endlist - - \image blur-effect-nodes.png - - You can now select the \uicontrol FastBlur node and in the settings, change - the \uicontrol fastBlurAmount value to control the amount of blur. - - \image blur-effect-step-1.webp - - \section3 Adjusting Item Borders - - The effect appears cropped. You need to adjust item borders: - - \list 1 - \li Select \inlineimage effect-item-borders-icon.png - to display item borders. - \image blur-effect-step-2.webp - \li Go to \uicontrol Edit > \uicontrol {Project Settings}. - \li Set the item padding for all sides to 100. - \image effect-item-padding-dialog.png - \endlist - - Now, you can see the complete blur effect. - - \image blur-effect-step-3.webp - -*/ diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc index d21e9ab7046..e2e8e8f389e 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc @@ -31,14 +31,16 @@ \list 1 \li Copy the \QBPS ZXP package from \c {Qt\Tools\QtDesignStudio\photoshop_bridge} to the - \c Documents directory in your user directory. + \c Documents directory in your user directory. The \c {file-name} + should look similar to: \c {qt.QtBridge}. \li Open Windows PowerShell. - \li Enter the following commands: + \li Enter the following commands, replacing + \c {<bridge-installation-file-name>} with the \c {file-name}: \badcode cd "$env:UserProfile\Documents" - mv .\io.qt.QtBridge.zxp .\io.qt.QtBridge.zip - expand-archive .\io.qt.QtBridge.zip - xcopy /E /I .\io.qt.QtBridge "$env:APPDATA\Adobe\CEP\extensions\io.qt.QtBridge" + mv .\<bridge-installation-file-name>.zxp .\<bridge-installation-file-name>.zip + expand-archive .\<bridge-installation-file-name>.zip + xcopy /E /I .\<bridge-installation-file-name> "$env:APPDATA\Adobe\CEP\extensions\<bridge-installation-file-name>" \endcode \endlist @@ -49,14 +51,16 @@ \list 1 \li Copy the \QBPS ZXP package from \c {Qt/QtDesignStudio/photoshop_bridge} - to your \c Documents directory. + to your \c Documents directory. The \c {file-name} + should look similar to: \c {qt.QtBridge}. \li Open Terminal. - \li Enter the following commands: + \li Enter the following commands, replacing + \c {<bridge-installation-file-name>} with the \c {file-name}: \badcode cd ~/Documents - unzip io.qt.QtBridge.zxp -d io.qt.QtBridge + unzip <bridge-installation-file-name>.zxp -d <bridge-installation-file-name> sudo mkdir -p /Library/Application\ Support/Adobe/CEP/extensions - sudo cp -R ./io.qt.QtBridge /Library/Application\ Support/Adobe/CEP/extensions + sudo cp -R ./<bridge-installation-file-name> /Library/Application\ Support/Adobe/CEP/extensions \endcode \endlist diff --git a/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc index 0ff4c90faf9..21733c996ac 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc @@ -25,18 +25,12 @@ and \l Properties view, to avoid breaking the code. \li \l{Managing Data Collection} - \if defined (qtcreator) - You can enable \QC to report crashes automatically. If you agreed to - pseudonymous user statistics collection during the \QC installation, - you can turn it on and determine what type of data is collected and - transmitted to the backend storage. - \else You can enable \QDS to report crashes automatically. If you enable the telemetry plugin, you can turn on the pseudonymous user statistics collection and determine what type of data is collected and transmitted to the backend storage. You can also modify settings for collecting user feedback. - \endif + \li \l{Packaging Applications} When you are ready to deliver your application to users or upload diff --git a/doc/qtdesignstudio/src/qtdesignstudio-effect-maker-files.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-effect-maker-files.qdoc deleted file mode 100644 index 06b3ea15906..00000000000 --- a/doc/qtdesignstudio/src/qtdesignstudio-effect-maker-files.qdoc +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2022 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Design Studio documentation. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** -****************************************************************************/ - -/*! - - \page qt-effect-maker-files.html - \nextpage qt-effect-maker.html - \previouspage creator-exporting-qml.html - \sa {Working with Effects in Qt Quick Effect Maker} - - \title Creating Qt Quick Effect Maker Files - - \section1 Creating an Effect File - - You can create Qt Quick Effect Maker effect (.qep) files in \QDS and - then edit them in Qt Quick Effect Maker. - - To create an effect file: - - \list 1 - \li In \QDS, right-click in the \uicontrol Assets view and - select \uicontrol {New Effect}. - \QDS creates an effect file and opens it in Qt Quick Effect Maker. - \image qt-quick-effect-maker.webp - \li Edit the effect. - \li In Qt Quick Effect Maker, go to \uicontrol File > \uicontrol Save. - \li Select \uicontrol File > \uicontrol Export. - \li With the default settings, select \uicontrol OK. - \image effect-maker-export.png - \endlist - - Now, you can close Qt Quick Effect Maker and return to \QDS and apply the - effect. - - \section1 Applying an Effect - - You can apply effects to components in \QDS. To do so, drag the effect - from the \uicontrol Assets view to the component in the \uicontrol 2D or - \uicontrol Navigator view. - - \image apply-effect-maker-effect.webp - - \section1 Animated Effect - - When you import an animated effect, you need to turn on the animation for it - to see the animation in your \QDS application. - - To turn on animation for an effect, first apply the effect to a component, - and then: - - \list 1 - \li Select the effect in \uicontrol Navigator. - \li In \uicontrol Properties, go to the - \uicontrol {Exposed Custom Properties} section and set - \uicontrol timeRunning to true. - \endlist -*/ diff --git a/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc index 772885ca385..e3a00cb8dfb 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc @@ -3,7 +3,7 @@ /*! \page studio-help.html - \previouspage creator-editor-external.html + \previouspage studio-compatibility-with-mcu-sdks.html \nextpage creator-help.html \title Help diff --git a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc index ffb23d35f2e..1aab65187ab 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc @@ -47,10 +47,10 @@ \li Creates a project that uses default and 3D components such as cameras, lights, 3D models, and materials. \row - \li Qt for MCUs + \li \QMCU \li MCU \li Creates an application that uses a subset of default components - (as supported by Qt for MCUs) that you can deploy, run, and debug + (as supported by \QMCU) that you can deploy, run, and debug on MCU boards. \row \li {1,3} Mobile diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc index 89a93a4d435..6fc2014020f 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc @@ -162,7 +162,7 @@ \list \li \l{Setting Up Qt Bridge for Figma} \li \l{Using Qt Bridge for Figma} - \li \l{Using Figma Quick Control Template in Qt Design Studio} + \li \l{Using Figma Quick Control Template Components in Qt Design Studio} \endlist \endlist \li \l {Exporting 3D Assets} @@ -180,11 +180,7 @@ \li \l{Importing 3D Assets} \endlist \li \l{Exporting Components} - \li Qt Quick Effect Maker - \list - \li \l{Creating Qt Quick Effect Maker Files} - \li \l{Working with Effects in Qt Quick Effect Maker} - \endlist + \li \l{Using Qt Quick Effect Maker Effects} \endlist \endlist \li \l{Motion Design} @@ -263,6 +259,10 @@ \li \l{Converting Qt 5 Projects into Qt 6 Projects} \li \l{Converting UI Projects to Applications} \li \l{Using External Tools} + \li \l{\QDS on MCUs} + \list + \li \l {\QDS Version Compatibility with \QMCU SDKs} + \endlist \endlist \li \l Help \list diff --git a/doc/qtdesignstudio/src/qtdesignstudio-using-effect-maker-effects.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-using-effect-maker-effects.qdoc new file mode 100644 index 00000000000..1e53c53ba0f --- /dev/null +++ b/doc/qtdesignstudio/src/qtdesignstudio-using-effect-maker-effects.qdoc @@ -0,0 +1,44 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + + \page qt-using-effect-maker-effects.html + \nextpage qtquick-motion-design.html + \previouspage creator-exporting-qml.html + + \title Using Qt Quick Effect Maker Effects + + \QQEM is integrated into \QDS for creating shader effects. To create an + effect, you first create the effect file in \QDS, and then you edit it in \QQEM. + + For more information about \QQEM, see the + \l{https://doc.qt.io/qt-6/qtquickeffectmaker-index.html}{Qt Quick Effect Maker Manual}. + + \section1 Creating an Effect File + + To create an effect file in \QDS: + + \list 1 + \li Right-click in the \uicontrol Assets view and + select \uicontrol {New Effect}. + \QDS creates an effect file and opens it in \QQEM. + \image qt-quick-effect-maker.webp + \li Edit the effect. + \li In \QQEM, go to \uicontrol File > \uicontrol Save. + \li With the default settings, select \uicontrol OK. + \image effect-maker-export.png + \endlist + + Now, you can close \QQEM and return to \QDS and apply the + effect. + + \section1 Applying an Effect + + You can apply effects to components in \QDS. To do so, drag the effect + from the \uicontrol Assets view to the component in the \uicontrol 2D or + \uicontrol Navigator view. + + \image apply-effect-maker-effect.webp + +*/ diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc index e9f302ce859..adf772987d4 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc @@ -81,6 +81,7 @@ \li \l{Converting Qt 5 Projects into Qt 6 Projects} \li \l{Converting UI Projects to Applications} \li \l{Using External Tools} + \li \l{\QDS on MCUs} \endlist \li \b {\l Help} \list diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc index e861133efd5..7af07ae66e4 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc @@ -4,26 +4,11 @@ /*! \page exporting-3d-assets.html - \if defined(qtdesignstudio) \previouspage qtbridge-figma-template.html - \else - \previouspage quick-states.html - \endif \nextpage exporting-from-blender.html \title Exporting 3D Assets - \if defined(qtcreator) - \table - \row - \li \inlineimage blender-logo.png - \li \inlineimage maya-logo.png - \row - \li \l{Exporting from Blender}{Blender} - \li \l{Exporting from Maya}{Maya} - \endtable - \endif - You can import files you created using 3D graphics applications and exported to several widely-used formats, such as .blend, .dae, .fbx, .glb, .gltf, .obj, .uia, or .uip. For a list of formats supported by each \l{Qt Quick 3D} diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc index 238b6e6dfdb..16494923806 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc @@ -4,11 +4,7 @@ /*! \page exporting-from-maya.html \previouspage exporting-from-blender.html - \if defined (qtdesignstudio) \nextpage exporting-from-qt3ds.html - \else - \nextpage studio-importing-3d.html - \endif \title Exporting from Maya 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 49bc8894139..360a21183b0 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 @@ -4,11 +4,7 @@ /*! \page exporting-from-qt3ds.html \previouspage exporting-from-maya.html - \if defined(qtdesignstudio) \nextpage studio-importing-designs.html - \else - \nextpage studio-importing-3d.html - \endif \title Exporting from Qt 3D Studio diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc index fd31970ef51..45d517a0bf4 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc @@ -3,11 +3,8 @@ /*! \page studio-importing-3d.html - \if defined(qtdesignstudio) + \previouspage qtquick-fonts.html - \else - \previouspage exporting-from-maya.html - \endif \nextpage creator-exporting-qml.html \title Importing 3D Assets diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc index 47e39f32118..8c798a31a4f 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc @@ -208,4 +208,97 @@ To specify the maximum distance for the shadow map, set the \uicontrol {Shadow map far} property value. Using smaller values may improve the precision and effects of the map. + + \section1 Baking Lightmaps + + \note Lightmaps baking is released as technical preview in \QDS 4.1. + + \section2 Baking Lightmaps for a 3D Model + Baked lightmap components are not visible in the \uicontrol Navigator view by default. To make + them visible, select \inlineimage icons/visibilityon.png + in the \uicontrol Navigator view. + + To bake lightmaps for a 3D model: + \list 1 + \li From \uicontrol Components, drag a \uicontrol {Baked Lightmap} component to + the 3D model in the \uicontrol Navigator view. + \image baked-lightmaps-navigator.png + \li In the \uicontrol Navigator view, select \e bakedLightmap and in the \uicontrol Properties + view: + \list + \li Select \uicontrol Enabled. + \li In \uicontrol Key, set the filename base for the generated light maps. This must be + a unique name. + \li In \uicontrol {Load Prefix}, set the relative path to the folder where the generated + light map files are saved. + \endlist + \li In the \uicontrol Navigator view, select the 3D model and in the \uicontrol Properties + view, select \uicontrol {Used in Baked Lighting}. + \li Optional. Adjust \uicontrol Resolution to set the light map resoution. This effects how + accurate and time-consuming the lightmap baking is. + \li In the \uicontrol Navigator view, select the light component that you want to bake + lightmaps for, and in the \uicontrol Properties view, set \uicontrol {Bake Mode} to BakeModeAll. + \li Right-click anywhere in the \uicontrol 3D view and select \uicontrol {Bake Lights}. + \endlist + + \section2 Baking Lightmaps for a 3D Model Inside a Sub Component + + To bake lightmaps for a 3D model inside a sub component, first add a local custom property to + expose the model: + + \list 1 + \li In the \uicontrol Navigator view, right-click the sub component and select + \uicontrol {Edit Component}. + \image baked-lightmaps-edit-component.png + \li In the \uicontrol Navigator view, select the root component. + \li In the \uicontrol Properties view, select \inlineimage icons/plus.png + in the \uicontrol {Local Custom Properties} section. + \li Add a new property, set \uicontrol Type to alias. + \image baked-lightmaps-add-property.png + \li For the property, set the value to the ID of the 3D model that you want + to bake lightmaps for. + \image baked-lightmaps-property-value.png + \li In the \uicontrol Navigator view, select the 3D model and in the \uicontrol Properties + view: + \list + \li Select \uicontrol {Used in Baked Lighting}. + \li Set \uicontrol Resolution to, for example, 128. + \endlist + \li Save your changes (\key {Ctrl+S}) and return to the main project file. To do this, select + the bread crumb in the top toolbar. + \image baked-lightmaps-exit-component.png + \li From the \uicontrol Components view, drag a \uicontrol {Baked Lightmap} component to the + sub component in the \uicontrol Navigator view. + \image baked-lightmaps-navigator-blm.png + \li In the \uicontrol Navigator view, select the sub component and go to the + \uicontrol Code view. + \li In the \uicontrol Code view, you need to set the properties for the model inside the sub + component by using the exposed property. + + Add the following code inside the sub component. + \code + lmSphere.bakedLightmap: bakedLightmap + \endcode + + It should look something like this: + \code + MyGroup { + id: group + lmSphere.bakedLightmap: bakedLightmap + BakedLightmap { + id: bakedLightmap + loadPrefix: "lightmaps" + } + } + \endcode + \li In the \uicontrol Navigator view, select \e bakedLightMap, and in the \uicontrol + Properties view: + \list + \li Select \uicontrol Enabled. + \li In \uicontrol Key, set the filename base for the generated light maps. This must be + a unique name. + \endlist + \li Right-click anywhere in the \uicontrol 3D view and select \uicontrol {Bake Lights}. + \endlist + */ diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-optimized-3d-scenes.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-optimized-3d-scenes.qdoc index 4032685223c..535bb392cab 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-optimized-3d-scenes.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-optimized-3d-scenes.qdoc @@ -4,11 +4,7 @@ /*! \page studio-optimized-3d-scenes.html \previouspage qtquick-optimizing-designs.html - \if defined(qtdesignstudio) \nextpage studio-implementing-applications.html - \else - \nextpage qtquick-iso-icon-browser.html - \endif \title Creating Optimized 3D Scenes @@ -22,11 +18,7 @@ \section1 The Optimal 3D Scene Example - \if defined(qtdesignstudio) The \l {Optimal 3D Scene} - \else - The Optimal 3D Scene - \endif example features four versions of the same kitchen scene that have been created using different strategies: High, Low, Combined, and Vertex Color. The High Scene includes a significantly higher number of diff --git a/doc/qtdesignstudio/src/views/creator-logical-operators.qdocinc b/doc/qtdesignstudio/src/views/creator-logical-operators.qdocinc index e3bb54af62c..307dfbfd36a 100644 --- a/doc/qtdesignstudio/src/views/creator-logical-operators.qdocinc +++ b/doc/qtdesignstudio/src/views/creator-logical-operators.qdocinc @@ -62,13 +62,10 @@ different type. \endtable - \if defined(qtdesignstudio) Alternatively, you can use \uicontrol {And Operator}, \uicontrol {Or Operator}, and \uicontrol {Not Operator} components to bind property values using the boolean AND, OR, and NOT operator. For more information, see \l{Logic Helpers}. - \endif - In addition, you can use arithmetic operators to compare numbers before checks. However, we recommend that you create separate properties for this diff --git a/doc/qtdesignstudio/src/views/qtquick-components-view.qdoc b/doc/qtdesignstudio/src/views/qtquick-components-view.qdoc index 8592db6a046..1e2786bfbc1 100644 --- a/doc/qtdesignstudio/src/views/qtquick-components-view.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-components-view.qdoc @@ -36,10 +36,8 @@ \li \l {UI Controls} \li \l {User Interaction Methods} \li \l {Lists and Other Data Models} - \if defined(qtdesignstudio) \li \l {2D Effects} \li \l {Logic Helpers} - \endif \li \l Animations \li \l{3D Views} \li \l{Node} diff --git a/doc/qtdesignstudio/src/views/qtquick-connection-editor-bindings.qdoc b/doc/qtdesignstudio/src/views/qtquick-connection-editor-bindings.qdoc index 4221657e6b8..613d8fd02f4 100644 --- a/doc/qtdesignstudio/src/views/qtquick-connection-editor-bindings.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-connection-editor-bindings.qdoc @@ -54,11 +54,7 @@ \list \li \l{Using States to Change Component Property Values} - \if defined(qtdesignstudio) \li \l{Exporting Properties} - \else - \li \l{Moving the Bubble} in \l{Creating a Mobile Application} - \endif \endlist For more information, watch the following video: diff --git a/doc/qtdesignstudio/src/views/qtquick-connection-editor-properties.qdoc b/doc/qtdesignstudio/src/views/qtquick-connection-editor-properties.qdoc index 0d61823fc66..8accd1df488 100644 --- a/doc/qtdesignstudio/src/views/qtquick-connection-editor-properties.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-connection-editor-properties.qdoc @@ -4,11 +4,8 @@ /*! \page quick-dynamic-properties.html \previouspage quick-property-bindings.html - \if defined(qtdesignstudio) \nextpage quick-states.html - \else - \nextpage quick-connections-backend.html - \endif + \sa {Specifying Component Properties} \title Specifying Custom Properties diff --git a/doc/qtdesignstudio/src/views/qtquick-connection-editor-signals.qdoc b/doc/qtdesignstudio/src/views/qtquick-connection-editor-signals.qdoc index a37d41c6355..420226750dc 100644 --- a/doc/qtdesignstudio/src/views/qtquick-connection-editor-signals.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-connection-editor-signals.qdoc @@ -63,17 +63,12 @@ in the context menu to specify the connection in \uicontrol {Connection Editor}. - \if defined(qtcreator) - For an example of using the \uicontrol {Connections} view, see - \l{Connecting Mouse Clicks to State Changes}. - \else For examples of using the \uicontrol {Connections} view, see: \list \li \l{Connecting Buttons to States} in \l{Log In UI - States} \li \l{Connecting Buttons to State Changes} in \l{Washing Machine UI} \endlist - \endif \section1 Adding Signal Handlers diff --git a/doc/qtdesignstudio/src/views/qtquick-connection-editor.qdoc b/doc/qtdesignstudio/src/views/qtquick-connection-editor.qdoc index 0512af58ad1..58831990191 100644 --- a/doc/qtdesignstudio/src/views/qtquick-connection-editor.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-connection-editor.qdoc @@ -33,12 +33,6 @@ not otherwise exist for a particular \l{Component Types} {component type} or your custom components. - \if defined(qtcreator) - \li \l{Managing C++ Backend Objects} - - Application developers can access QObject objects implemented in C++ - from QML files. - \endif \endlist For an example of using properties, bindings, and connections to create a diff --git a/doc/qtdesignstudio/src/views/qtquick-connection-view.qdoc b/doc/qtdesignstudio/src/views/qtquick-connection-view.qdoc index 69c2a78dc9c..93fbdc7ea7a 100644 --- a/doc/qtdesignstudio/src/views/qtquick-connection-view.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-connection-view.qdoc @@ -37,11 +37,6 @@ custom properties that would not otherwise exist for a particular \l{Component Types}{component type}. - \if defined(qtcreator) - In addition, application developers can use the \uicontrol Backends view - to access QObject objects implemented in C++ from QML files. - \endif - \section1 Summary of the Connections View Tabs \table @@ -64,11 +59,6 @@ \li Add custom properties that would not otherwise exist for a particular preset component or your own custom component. \li \l{Specifying Custom Properties} - \if defined(qtcreator) - \row - \li \uicontrol Backends - \li Access QObject objects implemented in C++ from QML files. - \li \l{Managing C++ Backend Objects} - \endif + \endtable */ diff --git a/doc/qtdesignstudio/src/views/qtquick-designer.qdoc b/doc/qtdesignstudio/src/views/qtquick-designer.qdoc index a324c6f5626..cc18d924417 100644 --- a/doc/qtdesignstudio/src/views/qtquick-designer.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-designer.qdoc @@ -9,13 +9,9 @@ /*! \page creator-using-qt-quick-designer.html - \if defined(qtdesignstudio) + \previouspage creator-modes.html \nextpage qtquick-form-editor.html - \else - \previouspage quick-projects.html - \nextpage quick-uis.html - \endif \title Design Views @@ -151,7 +147,6 @@ \li Keyboard Shortcut \li Read More - \if defined(qtdesignstudio) \row \li \inlineimage icons/home.png \li \uicontrol {Home}: opens the welcome page. @@ -168,7 +163,6 @@ make to the UI are instantly visible to you in the preview. \li \key Alt+P (\key Opt+P on \macos) \li \l{Validating with Target Hardware} - \endif \row \li Currently open file diff --git a/doc/qtdesignstudio/src/views/qtquick-properties.qdoc b/doc/qtdesignstudio/src/views/qtquick-properties.qdoc index 8ce14eba6bf..fc8ba92e93f 100644 --- a/doc/qtdesignstudio/src/views/qtquick-properties.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-properties.qdoc @@ -214,7 +214,6 @@ use of solid color fills or images. Consider using gradients only for static components in a UI. - \if defined(qtdesignstudio) \section2 Setting Gradient Properties \image qtquick-designer-gradient-types.png "Available gradient types" @@ -262,7 +261,6 @@ in the \uicontrol Angle field. \image qtquick-designer-gradient-properties-conical.png "Conical gradient properties" - \endif \section2 Selecting Web Gradients diff --git a/doc/qtdesignstudio/src/views/qtquick-states.qdoc b/doc/qtdesignstudio/src/views/qtquick-states.qdoc index 6b55e5e59f0..60e3c3f86b7 100644 --- a/doc/qtdesignstudio/src/views/qtquick-states.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-states.qdoc @@ -3,13 +3,8 @@ /*! \page quick-states.html - \if defined(qtdesignstudio) \previouspage quick-dynamic-properties.html \nextpage creator-live-preview.html - \else - \previouspage quick-connections-backend.html - \nextpage exporting-3d-assets.html - \endif \title Working with States @@ -32,13 +27,11 @@ > \uicontrol {Qt Quick Controls} > \uicontrol Controls has predefined \e normal and \e down states. - \if defined(qtdesignstudio) This also applies to the custom button component that you can create by using a \l{Creating Custom Controls}{wizard template}. For more information about editing the states within the button component and hiding and showing buttons to create several screens, see \l{Log In UI - Components} and \l{Log In UI - States}. - \endif To add motion to a screen, you can change the position of a component instance in the \uicontrol {2D} view and then add animation to the change @@ -122,11 +115,9 @@ when: control.pressed || control.checked && !control.hovered \endcode - \if defined(qtdesignstudio) If you are not familiar with writing expressions, you can use preset \l{Logic Helpers}{logic helpers} from \uicontrol Components > \uicontrol {Qt Quick Studio Logic Helper}. - \endif \section1 Using States @@ -169,10 +160,6 @@ select \uicontrol Default. \endlist - \if defined(qtcreator) - \include qtquick-states-scxml.qdocinc scxml state machines - \endif - \section1 State Groups With state groups, you can change the state of certain components diff --git a/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc b/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc index aaaf254d1e6..75e84be9c45 100644 --- a/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc @@ -4,11 +4,7 @@ /*! \page qtquick-text-editor.html \previouspage qtquick-curve-editor.html - \if defined(qtdesignstudio) \nextpage creator-projects-view.html - \else - \nextpage quick-uis.html - \endif \title Code diff --git a/doc/qtdesignstudio/src/views/qtquick-timeline-view.qdoc b/doc/qtdesignstudio/src/views/qtquick-timeline-view.qdoc index 1fcf4ef9088..81947261841 100644 --- a/doc/qtdesignstudio/src/views/qtquick-timeline-view.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-timeline-view.qdoc @@ -46,10 +46,7 @@ \youtube V3Po15bNErw - \if defined(qtdesignstudio) To try it yourself, follow the \l{Log In UI - Timeline} tutorial. - \endif - For more information about creating timeline animations, see \l{Creating Timeline Animations}. diff --git a/doc/qtdesignstudio/src/views/qtquick-timeline.qdoc b/doc/qtdesignstudio/src/views/qtquick-timeline.qdoc index 12b1fc14633..c6a33f62c70 100644 --- a/doc/qtdesignstudio/src/views/qtquick-timeline.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-timeline.qdoc @@ -250,7 +250,6 @@ create a timeline for the Item, and set the rotation property for the start and end keyframes. - \if defined(qtdesignstudio) \section1 Animating Shapes You can use the \uicontrol {Qt Quick Studio Components} to animate the @@ -263,5 +262,5 @@ \li \l Rectangle \li \l Triangle \endlist - \endif + */ diff --git a/doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc b/doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc index 3ee43335d69..b21207259e2 100644 --- a/doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc @@ -114,8 +114,4 @@ To remove the current transition, select the \inlineimage icons/minus.png (\uicontrol {Remove Transition}) button. - \if defined(qtcreator) - For an example of animating transitions between states, see - \l {Creating a Qt Quick Application}. - \endif */ diff --git a/doc/qtdesignstudio/src/views/studio-workspaces.qdoc b/doc/qtdesignstudio/src/views/studio-workspaces.qdoc index 8d29b1f74f0..b5f7abf0d34 100644 --- a/doc/qtdesignstudio/src/views/studio-workspaces.qdoc +++ b/doc/qtdesignstudio/src/views/studio-workspaces.qdoc @@ -3,11 +3,7 @@ /*! \page creator-project-managing-workspaces.html - \if defined(qtdesignstudio) \previouspage studio-texture-editor.html - \else - \previouspage creator-open-documents-view.html - \endif \nextpage creator-project-managing-sessions.html \title Managing Workspaces |
