feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: Remove conditional statements from docs

Browse Source 
Task-number: QDS-9484
Change-Id: Ib494dbf729ba77e64aa1fb1060b6dcc31fbf818c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Mats Honkamaa
2023-03-30 13:01:26 +03:00
parent 129153e663
commit b97ea976cd
41 changed files with 10 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/qtdesignstudio/src/components/qtquick-animation-types.qdoc
View File

@@ -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

13
doc/qtdesignstudio/src/components/qtquick-buttons.qdoc
View File

@@ -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).

4
doc/qtdesignstudio/src/components/qtquick-component-context-menu.qdocinc
View File

@@ -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}

10
doc/qtdesignstudio/src/components/qtquick-components-custom.qdoc
View File

@@ -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

4
doc/qtdesignstudio/src/components/qtquick-components.qdoc
View File

@@ -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

39
doc/qtdesignstudio/src/components/qtquick-controls.qdoc
View File

@@ -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

8
doc/qtdesignstudio/src/components/qtquick-data-models.qdoc
View File

@@ -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}

4
doc/qtdesignstudio/src/components/qtquick-images.qdoc
View File

@@ -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
*/

2
doc/qtdesignstudio/src/components/qtquick-pathview-editor.qdocinc
View File

@@ -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]

16
doc/qtdesignstudio/src/components/qtquick-positioning.qdoc
View File

@@ -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}

2
doc/qtdesignstudio/src/components/qtquick-preset-components.qdoc
View File

@@ -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

11
doc/qtdesignstudio/src/components/qtquick-shapes.qdoc
View File

@@ -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
*/

6
doc/qtdesignstudio/src/components/qtquick-text.qdoc
View File

@@ -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

5
doc/qtdesignstudio/src/components/qtquick-user-interaction-methods.qdoc
View File

@@ -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

4
doc/qtdesignstudio/src/overviews/qtquick-animation-overview.qdoc
View File

@@ -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

5
doc/qtdesignstudio/src/overviews/qtquick-annotations.qdoc
View File

@@ -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

6
doc/qtdesignstudio/src/overviews/qtquick-creating-ui-logic.qdoc
View File

@@ -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}

5
doc/qtdesignstudio/src/overviews/qtquick-fonts.qdoc
View File

@@ -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

26
doc/qtdesignstudio/src/overviews/qtquick-prototyping.qdoc
View File

@@ -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
*/

28
doc/qtdesignstudio/src/overviews/qtquick-uis.qdoc
View File

@@ -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
*/

8
doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc
View File

@@ -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

15
doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc
View File

@@ -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}

4
doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc
View File

@@ -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

4
doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc
View File

@@ -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

5
doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc
View File

@@ -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

8
doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-optimized-3d-scenes.qdoc
View File

@@ -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

3
doc/qtdesignstudio/src/views/creator-logical-operators.qdocinc
View File

@@ -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

2
doc/qtdesignstudio/src/views/qtquick-components-view.qdoc
View File

@@ -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}

4
doc/qtdesignstudio/src/views/qtquick-connection-editor-bindings.qdoc
View File

@@ -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:

5
doc/qtdesignstudio/src/views/qtquick-connection-editor-properties.qdoc
View File

@@ -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

5
doc/qtdesignstudio/src/views/qtquick-connection-editor-signals.qdoc
View File

@@ -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

6
doc/qtdesignstudio/src/views/qtquick-connection-editor.qdoc
View File

@@ -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

12
doc/qtdesignstudio/src/views/qtquick-connection-view.qdoc
View File

@@ -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
*/

8
doc/qtdesignstudio/src/views/qtquick-designer.qdoc
View File

@@ -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

2
doc/qtdesignstudio/src/views/qtquick-properties.qdoc
View File

@@ -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

13
doc/qtdesignstudio/src/views/qtquick-states.qdoc
View File

@@ -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

4
doc/qtdesignstudio/src/views/qtquick-text-editor.qdoc
View File

@@ -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

3
doc/qtdesignstudio/src/views/qtquick-timeline-view.qdoc
View File

@@ -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}.

3
doc/qtdesignstudio/src/views/qtquick-timeline.qdoc
View File

@@ -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
*/

4
doc/qtdesignstudio/src/views/qtquick-transition-editor.qdoc
View File

@@ -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
*/

4
doc/qtdesignstudio/src/views/studio-workspaces.qdoc
View File

@@ -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