Merge remote-tracking branch 'origin/4.12'

Conflicts:
	src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp

Change-Id: I4a90920e52dbbe9eb46aef3437ee3c5a6e7b31c6
This commit is contained in:
Eike Ziller
2020-03-16 08:30:33 +01:00
181 changed files with 1729 additions and 856 deletions
@@ -32,21 +32,42 @@
\title Managing Workspaces
In the Design and Debug modes, you can arrange a set of \QC
views as a \e workspace on the screen. For a list of views,
select \uicontrol Window > \uicontrol Views.
views as a \e workspace on the screen.
In \QMLD, you can select the \uicontrol {Restore last workspace on startup}
check box to save the current workspace as a \e default workspace when you
exit \QC and to restore it the next time you start \QC.
To detach views:
To manage workspaces, select \uicontrol Window > \uicontrol Workspaces >
\uicontrol Manage.
\list
\li Double-click the title bar of the view.
\li Start dragging the view to another position.
\li Select the \inlineimage icons/detach-group-icon.png
(\uicontrol {Detach Group}) button.
\endlist
You can move detached views or groups of views anywhere on the screen.
To attach views, drag them over the dock area markers until the dock area
where you want to attach the view is highlighted, and then drop them into
the dock area.
\image qtcreator-workspace-attaching-views.png "Attaching views"
To close groups of views, select the \uicontrol {Close Group} button.
To open closed views, select \uicontrol Window > \uicontrol Views.
\section1 Saving Workspaces
The changes you make to a workspace are saved when you exit \QC.
In \QMLD, you can select \uicontrol Window > \uicontrol Workspaces >
\uicontrol Manage > \uicontrol {Restore last workspace on startup}
to restore the current workspace the next time you start \QC.
\image qtcreator-workspace-manager.png "Workspace Manager"
To save a workspace under a new name, select \uicontrol Clone.
To delete the selected workspace, select \uicontrol Delete.
To revert the changes you made to a preset workspace, select
\uicontrol Reset.
To switch between workspaces, select \uicontrol {Switch To}.
@@ -61,4 +82,5 @@
switch to it.
\endlist
To delete the selected workspace, select \uicontrol Delete.
*/
+47 -17
View File
@@ -25,7 +25,7 @@
/*!
\contentspage {Qt Creator}
\contentspage index.html
\page qtcreator-toc.html
\title All Topics
@@ -91,25 +91,55 @@
\list
\li \l {Creating Qt Quick Projects}
\li \l {Editing QML Files in Design Mode}
\li \l {Creating Components}
\li \l {Creating UIs}
\list
\li \l {Creating Buttons}
\li \l {Creating Scalable Buttons and Borders}
\li \l {Creating Components}
\list
\li \l{Creating Buttons}
\li \l{Creating Scalable Buttons and Borders}
\endlist
\li \l{Managing Item Hierarchy}
\li \l{Specifying Item Properties}
\li \l{Using Custom Fonts}
\li \l{Annotating Designs}
\li \l{Qt Quick UI Forms}
\endlist
\li \l {Adding Dynamics}
\list
\li \l{Creating Animations}
\li \l{Adding Connections}
\list
\li \l{Connecting Objects to Signals}
\li \l{Specifying Dynamic Properties}
\li \l{Adding Bindings Between Properties}
\li \l{Managing C++ Backend Objects}
\endlist
\li \l {Adding States}
\li \l {Editing PathView Properties}
\endlist
\li \l {Managing Item Hierarchy}
\li \l {Specifying Item Properties}
\li \l {Creating Animations}
\li \l {Adding Connections}
\list
\li \l{Connecting Objects to Signals}
\li \l{Specifying Dynamic Properties}
\li \l{Adding Bindings Between Properties}
\li \l{Managing C++ Backend Objects}
\endlist
\li \l {Adding States}
\li \l {Editing PathView Properties}
\li \l{Editing 3D Scenes}
\list
\li \l {Exporting 3D Assets}
\list
\li \l{Exporting from Blender}{Blender}
\li \l{Exporting from Maya}{Maya}
\endlist
\li \l{Importing 3D Assets}
\li \l{Editing 3D Assets in Design Mode}
\li \l{Working in the 3D Editor}
\li \l{Adding 3D Views}
\li \l{Using 3D Components}
\list
\li \l{Setting Node Properties}
\li \l{Adding Models}
\li \l{Using Materials and Shaders}
\li \l{Attaching Textures to Materials}
\li \l{Using Lights}
\li \l{Using Scene Camera}
\li \l{Setting Scene Environment}
\endlist
\endlist
\li \l {Browsing ISO 7000 Icons}
\li \l {Qt Quick UI Forms}
\li \l {Using QML Modules with Plugins}
\li \l {Converting UI Projects to Applications}
\endlist
@@ -33,40 +33,13 @@
\contentspage index.html
\page creator-visual-editor.html
\if defined(qtdesignstudio)
\previouspage quick-converting-ui-projects.html
\nextpage quick-components.html
\else
\previouspage creator-design-mode.html
\nextpage quick-projects.html
\endif
\title Developing Qt Quick Applications
\if defined(qtdesignstudio)
When you install \QDS, everything you'll need to design UIs
using \l{Qt Quick} and to preview them on the desktop or on Android or
embedded Linux devices is automatically installed and configured correctly
for you.
\endif
Qt Quick enables you to build UIs around the behavior of
\e components and how they connect with one another. You
create components using Qt Quick and QML types that are available in
the Design mode. You can specify values for the \e properties of a
component to change its appearance and behavior. All QML types have a
set of predefined properties, some of which control things that are
visible to users, while others are used behind the scene.
While it is useful to learn the basics of Qt Quick, you can also rely on
\QDS to write the code for you when you drag-and-drop the ready-made
components to the working area and change them to your liking by modifying
their properties in the Design mode. You can always check up details in
the extensive Qt Quick documentation by pressing \key F1.
\list
\if defined(qtcreator)
\li \l {Creating Qt Quick Projects}
You can use wizards to create Qt Quick projects.
@@ -76,87 +49,41 @@
You can use the \uicontrol {Form Editor} or the
\uicontrol {Text Editor} in the Design mode to
develop Qt Quick applications.
\endif
\li \l {Creating Components}
\li \l {Creating UIs}
In addition to your imported artwork, you can use the Design
mode to customize ready-made components or design any custom form
and shape directly as QML types. You can import visual assets in
various formats, such as PNG, JPG, and SVG for use in the
components.
Qt Quick enables you to build UIs around the behavior of
\e components and how they connect with one another. You
create components using Qt Quick and QML types that are
available in the Design mode, manage their relationships,
and specify their properties.
\li \l {Managing Item Hierarchy}
\li \l {Adding Dynamics}
You can manage the items in the current QML file and their
relationships in the \uicontrol Navigator.
You can animate the properties of UI components and create
connections between them to enable them to communicate with
each other.
\li \l {Specifying Item Properties}
\li \l {Editing 3D Scenes}
You can specify values for the properties of a component to change
its appearance and behavior. All QML types have a set of predefined
properties. Some properties, such as position, size, and visibility,
are common to all QML types, whereas others are specific to the QML
type. You can specify properties for your components in the
\uicontrol Properties view.
You can use the 3D editor in the Design mode to edit files you
created using 3D graphics applications and stored in one of the
supported formats. You cannot create 3D models or other assets
in the editor, but you can import the assets you need and work
with them to create scenes and states, as well as the
transitions between them.
\li \l {Creating Animations}
You can use a timeline and keyframe based editor in the
\uicontrol Timeline view to animate the properties of UI
components. Animating properties enables their values to
move through intermediate values at specified keyframes
instead of immediately changing to the target value.
\li \l {Adding Connections}
You can create connections between the UI components and
the application to enable them to communicate with each other. For
example, how does the appearance of a button change on a mouse click
and which action does the application need to perform in response to
it.
You can also create connections between UI components by
binding their properties together. This way, when the value of a
property changes in a parent component, it can be automatically
changed in all the child components, for example.
\li \l {Adding States}
Qt Quick allows you to declare various UI states that describe
how component properties change from a base state. Therefore,
states can be a useful way of organizing your UI
logic. You can associate transitions with items to define
how their properties will animate when they change due to a state
change.
\endlist
\section1 Related Topics
\list
\if defined(qtdesignstudio)
\li \l {Using Custom Fonts}
You can load custom fonts to \QDS and use them in your designs.
\endif
\li \l {Editing PathView Properties}
You can use a graphical spline editor to specify \l{PathView} paths.
A path view lays out data provided by data models on a \l{Path}.
\li \l {Browsing ISO 7000 Icons}
You can add ISO 7000 icons from a library delivered with \QC to
UIs and change their color.
\li \l{Qt Quick UI Forms}
Some of the wizards create Qt Quick projects that contain UI forms
(.ui.qml files). The forms use a purely declarative subset of the
QML language and you can edit them in the Design mode.
\if defined(qtcreator)
\li \l {Using QML Modules with Plugins}
QML modules may use plugins to expose components defined in C++ to
@@ -171,7 +98,6 @@
interfaces. To use them for application development, you have to
convert them to Qt Quick Application projects that contain .pro,
.cpp, and .qrc files.
\endif
\endlist
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -26,8 +26,8 @@
/*!
\contentspage index.html
\page qtquick-iso-icon-browser.html
\previouspage qmldesigner-pathview-editor.html
\nextpage creator-quick-ui-forms.html
\previouspage studio-3d-scene-environment.html
\nextpage creator-qml-modules-with-plugins.html
\title Browsing ISO 7000 Icons
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
\contentspage {Qt Creator}
\contentspage index.html
\previouspage creator-live-preview-devices.html
\page qt-design-viewer.html
\if defined(qtdesignstudio)
@@ -0,0 +1,70 @@
/****************************************************************************
**
** Copyright (C) 2020 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.
**
****************************************************************************/
/*!
\contentspage index.html
\page qtquick-adding-dynamics.html
\previouspage qtquick-fonts.html
\nextpage studio-timeline.html
\title Adding Dynamics
You can animate the properties of UI components and create connections
between them to enable them to communicate with each other.
\list
\li \l {Creating Animations}
You can use a timeline and keyframe based editor in the
\uicontrol Timeline view to animate the properties of UI
components. Animating properties enables their values to
move through intermediate values at specified keyframes
instead of immediately changing to the target value.
\li \l {Adding Connections}
You can create connections between the UI components and
the application to enable them to communicate with each other. For
example, how does the appearance of a button change on a mouse click
and which action does the application need to perform in response to
it.
You can also create connections between UI components by
binding their properties together. This way, when the value of a
property changes in a parent component, it can be automatically
changed in all the child components, for example.
\li \l {Adding States}
Qt Quick allows you to declare various UI states that describe
how component properties change from a base state. Therefore,
states can be a useful way of organizing your UI
logic. You can associate transitions with items to define
how their properties will animate when they change due to a state
change.
\li \l {Editing PathView Properties}
You can use a graphical spline editor to specify \l{PathView} paths.
A path view lays out data provided by data models on a \l{Path}.
\endlist
*/
@@ -0,0 +1,76 @@
/****************************************************************************
**
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator 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.
**
****************************************************************************/
/*!
\contentspage {Qt Creator Manual}
\page qtquick-annotations.html
\previouspage qtquick-fonts.html
\nextpage creator-quick-ui-forms.html
\title Annotating Designs
You can submit your designs to review or further development as QML files.
You can annotate your designs to provide reviewers or developers with
additional information about them. An annotation consist of an annotation
name and one or several comments. The comments have a title, author, and
comment text.
\image qtquick-annotations.png "Annotations displayed in the Form Editor tab"
Annotations are saved in the end of QML files when you save the file. They
do not affect the QML performance in any way.
To view annotations, select the annotation icon.
To edit annotations, select \uicontrol {Edit Annotation} in the context
menu of the annotation icon.
\section1 Adding Annotations
To add annotations:
\list 1
\li Select the component to annotate in the \uicontrol Navigator
or in the \uicontrol {Form Editor}.
\li In the \uicontrol Properties view, select
\uicontrol {Add Annotation}.
\image qtquick-annotation-editor.png "Annotation Editor"
\li The \uicontrol {Selected Item} field displays the ID of the
component. Enter a name for the annotation in the
\uicontrol {Custom ID} field.
\li In the \uicontrol Title field, enter the text to display in
the tab for this comment.
\li In the \uicontrol Author field, enter the author's name.
\li In the \uicontrol Text field, enter the comment text.
\li Select \uicontrol OK.
\endlist
To add more comments about the component, select the \inlineimage plus.png
(\uicontrol {Add Comment}) button.
To remove the active comment, select the \inlineimage minus.png
(\uicontrol {Remove Comment}) button. To remove the annotation, right-click
the annotation icon, and then select \uicontrol {Remove Annotation}.
*/
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -24,8 +24,8 @@
****************************************************************************/
/*!
\contentspage {Qt Creator Manual}
\previouspage qmldesigner-connections.html
\contentspage index.html
\previouspage quick-signals.html
\page quick-dynamic-properties.html
\nextpage quick-property-bindings.html
@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -25,7 +25,7 @@
/*!
\contentspage index.html
\previouspage quick-states.html
\previouspage studio-timeline.html
\page qmldesigner-connections.html
\nextpage quick-signals.html
@@ -37,7 +37,7 @@
\nextpage {Tutorials}
\else
\previouspage quick-projects.html
\nextpage quick-components.html
\nextpage quick-uis.html
\endif
\title Editing QML Files in Design Mode
@@ -0,0 +1,55 @@
/****************************************************************************
**
** Copyright (C) 2020 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.
**
****************************************************************************/
/*!
\contentspage index.html
\previouspage qtquick-properties.html
\page qtquick-fonts.html
\nextpage qtquick-annotations.html
\title Using Custom Fonts
For your UI to use custom fonts when you preview it on a device,
you have to import the fonts to the project folder. \QDS deploys them to
the device along with your UI.
\note Use fixed-width fonts if you plan to animate running numbers, so that
they do not appear to jump around the screen when they change.
To add fonts:
\list 1
\li Select \uicontrol Library > \uicontrol Assets >
\uicontrol {Add New Assets}.
\li Browse to the folder that contains the font files and select them.
\li Enter the name of the directory to save the fonts. By default, \QDS
suggests the project directory.
\li Select \uicontrol OK to save the fonts.
\endlist
The fonts are added to the list of fonts for the \uicontrol Font property
in \uicontrol Properties.
*/
@@ -28,7 +28,7 @@
\page quick-converting-ui-projects.html
\if defined(qtdesignstudio)
\previouspage studio-importing-designs.html
\nextpage studio-prototyping.html
\nextpage quick-uis.html
\else
\previouspage creator-qml-modules-with-plugins.html
\nextpage creator-using-qt-designer.html
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
\contentspage {Qt Creator}
\contentspage index.html
\previouspage creator-live-preview.html
\page creator-live-preview-desktop.html
\nextpage creator-live-preview-devices.html
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
\contentspage {Qt Creator}
\contentspage index.html
\previouspage creator-live-preview-desktop.html
\page creator-live-preview-devices.html
\nextpage qt-design-viewer.html
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
\contentspage {Qt Creator}
\contentspage index.html
\if defined(qtdesignstudio)
\previouspage studio-3d-camera.html
\else
@@ -27,11 +27,7 @@
\contentspage index.html
\page qmldesigner-pathview-editor.html
\previouspage quick-states.html
\if defined(qtdesignstudio)
\nextpage studio-3d.html
\else
\nextpage qtquick-iso-icon-browser.html
\endif
\title Editing PathView Properties
@@ -24,14 +24,10 @@
****************************************************************************/
/*!
\contentspage {Qt Creator Manual}
\contentspage index.html
\page qtquick-properties.html
\previouspage qtquick-navigator.html
\if defined(qtdesignstudio)
\nextpage studio-fonts.html
\else
\nextpage studio-timeline.html
\endif
\nextpage qtquick-fonts.html
\title Specifying Item Properties
@@ -25,11 +25,7 @@
/*!
\contentspage {Qt Design Studio Manual}
\if defined(qtdesignstudio)
\previouspage studio-adding-dynamics.html
\else
\previouspage qtquick-properties.html
\endif
\previouspage qtquick-adding-dynamics.html
\page studio-timeline.html
\nextpage qmldesigner-connections.html
@@ -33,11 +33,10 @@
\contentspage index.html
\page creator-quick-ui-forms.html
\previouspage qtquick-annotations.html
\if defined(qtdesignstudio)
\previouspage qmldesigner-pathview-editor.html
\nextpage creator-live-preview.html
\else
\previouspage qtquick-iso-icon-browser.html
\nextpage creator-qml-modules-with-plugins.html
\endif
+105
View File
@@ -0,0 +1,105 @@
/****************************************************************************
**
** Copyright (C) 2020 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.
**
****************************************************************************/
/*!
\contentspage index.html
\page quick-uis.html
\if defined(qtdesignstudio)
\previouspage quick-converting-ui-projects.html
\else
\previouspage creator-using-qt-quick-designer.html
\endif
\nextpage quick-components.html
\title Creating UIs
\if defined(qtdesignstudio)
When you install \QDS, everything you'll need to design UIs
using \l{Qt Quick} and to preview them on the desktop or on Android or
embedded Linux devices is automatically installed and configured correctly
for you.
\endif
Qt Quick enables you to build UIs around the behavior of
\e components and how they connect with one another. You
create components using Qt Quick and QML types that are available in
the Design mode. You can specify values for the \e properties of a
component to change its appearance and behavior. All QML types have a
set of predefined properties, some of which control things that are
visible to users, while others are used behind the scene.
While it is useful to learn the basics of Qt Quick, you can also rely on
\QMLD to write the code for you when you drag-and-drop the ready-made
components to the working area and change them to your liking by modifying
their properties in the Design mode. You can always check up details in
the extensive Qt Quick documentation by pressing \key F1.
\list
\li \l {Creating Components}
In addition to your imported artwork, you can use the Design
mode to customize ready-made components or design any custom form
and shape directly as QML types. You can import visual assets in
various formats, such as PNG, JPG, and SVG for use in the
components.
\li \l {Managing Item Hierarchy}
You can manage the items in the current QML file and their
relationships in the \uicontrol Navigator.
\li \l {Specifying Item Properties}
You can specify values for the properties of a component to change
its appearance and behavior. All QML types have a set of predefined
properties. Some properties, such as position, size, and visibility,
are common to all QML types, whereas others are specific to the QML
type. You can specify properties for your components in the
\uicontrol Properties view.
\li \l {Using Custom Fonts}
You can load custom fonts to \QMLD and use them in your designs.
\li \l {Annotating Designs}
You can annotate your designs to provide reviewers or developers
with additional information about them.
\if defined(qtdesignstudio)
\endlist
\section1 Related Topics
\list
\endif
\li \l{Qt Quick UI Forms}
Some of the wizards create Qt Quick projects that contain UI forms
(.ui.qml files). The forms use a purely declarative subset of the
QML language and you can edit them in the Design mode.
\endlist
*/