aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2020-02-26 09:36:22 +0100
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2020-03-12 08:40:41 +0000
commit9e915ecba0e89b113b431ead327e590d630364f0 (patch)
tree971eb196e902a973c68a5d88b8f2d16755f37f19
parent9c50a783e0625494d32fea1b4f563a313ff0beff (diff)
Doc: Describe Qt Quick Designer 3D editor
- Pull source files from /doc/qtdesignstudio/srcqtquick3d-editor - Add the necessary defines to link to additional Qt modules - Use the same structure and files for the Qt Quick Designer parts as in Qt Design Studio Manual - Move some overviews to /doc/qtcreator folder - Fix the TOC and the navigation links Change-Id: I2103a8e635e537fd276b3e14feeb8f50beb92cae Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--doc/qtcreator/config/qtcreator-project.qdocconf9
-rw-r--r--doc/qtcreator/src/qtcreator-toc.qdoc63
-rw-r--r--doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc108
-rw-r--r--doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc6
-rw-r--r--doc/qtcreator/src/qtquick/qt-design-viewer.qdoc2
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc (renamed from doc/qtdesignstudio/src/qtdesignstudio-adding-dynamics.qdoc)8
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc6
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc4
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-designer.qdoc2
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-fonts.qdoc (renamed from doc/qtdesignstudio/src/qtdesignstudio-fonts.qdoc)6
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc2
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc2
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc2
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc2
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc4
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-properties.qdoc8
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-timeline.qdoc6
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-uis.qdoc (renamed from doc/qtdesignstudio/src/qtdesignstudio-prototyping.qdoc)14
-rw-r--r--doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc109
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc132
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc4
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc6
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc10
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc8
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc72
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc6
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc23
35 files changed, 342 insertions, 298 deletions
diff --git a/doc/qtcreator/config/qtcreator-project.qdocconf b/doc/qtcreator/config/qtcreator-project.qdocconf
index 8560235017..a9a0ef579d 100644
--- a/doc/qtcreator/config/qtcreator-project.qdocconf
+++ b/doc/qtcreator/config/qtcreator-project.qdocconf
@@ -3,8 +3,11 @@ description = "$IDE_DISPLAY_NAME Manual"
url = http://doc.qt.io/$IDE_ID
headerdirs =
-sourcedirs = ../src
+sourcedirs = ../src \
+ ../../qtdesignstudio/src/qtquick3d-editor
+
imagedirs = ../images \
+ ../../qtdesignstudio/images \
../../../src/libs/qmleditorwidgets/images \
../../../src/libs/utils/images \
../../../src/plugins/android/images \
@@ -16,6 +19,7 @@ imagedirs = ../images \
../../../src/plugins/help/images \
../../../src/plugins/projectexplorer/images \
../../../src/plugins/qmldesigner/components/componentcore/images \
+ ../../../src/plugins/qmldesigner/components/edit3d/images \
../../../src/plugins/qmldesigner/components/formeditor \
../../../src/plugins/qmldesigner/components/navigator \
../../../src/plugins/qmldesigner/components/timelineeditor/images \
@@ -35,12 +39,15 @@ depends += qtwidgets \
qtcmake \
qtcore \
qtqml \
+ qtqmlmodels \
qtquick \
qmake \
qtdesigner \
qtdoc \
+ qtgraphicaleffects \
qtgui \
qthelp \
+ qtquick3d \
qtquickcontrols \
qtquickextras \
qtquicktimeline \
diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc
index 1bfa7024fc..532216a700 100644
--- a/doc/qtcreator/src/qtcreator-toc.qdoc
+++ b/doc/qtcreator/src/qtcreator-toc.qdoc
@@ -25,7 +25,7 @@
/*!
- \contentspage {Qt Creator}
+ \contentspage index.html
\page qtcreator-toc.html
\title All Topics
@@ -91,25 +91,54 @@
\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{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
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc
index a7938078ab..1646888957 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc
@@ -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}
-
- 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 {Creating UIs}
- \li \l {Creating Animations}
+ 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.
- 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 Dynamics}
- \li \l {Adding Connections}
+ You can animate the properties of UI components and create
+ connections between them to enable them to communicate with
+ each other.
- 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.
+ \li \l {Editing 3D Scenes}
- 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.
+ 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 {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
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc
index 0dbfc06b9f..4a9c57e9e6 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc
@@ -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
diff --git a/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc b/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
index 2c63c05baf..044737bf74 100644
--- a/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
+++ b/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
- \contentspage {Qt Creator}
+ \contentspage index.html
\previouspage creator-live-preview-devices.html
\page qt-design-viewer.html
\if defined(qtdesignstudio)
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-adding-dynamics.qdoc b/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc
index 60891e2aa3..a2e4b5865a 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-adding-dynamics.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc
@@ -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 Design Studio documentation.
@@ -24,9 +24,9 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio Manual}
- \page studio-adding-dynamics.html
- \previouspage studio-fonts.html
+ \contentspage index.html
+ \page qtquick-adding-dynamics.html
+ \previouspage qtquick-fonts.html
\nextpage studio-timeline.html
\title Adding Dynamics
diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc
index 651c224a18..1473007a54 100644
--- a/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc
@@ -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
diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc
index a79d9c88fd..d3cefb7699 100644
--- a/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc
@@ -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
diff --git a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc
index 6666f421dd..50e01b8307 100644
--- a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc
@@ -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
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-fonts.qdoc b/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc
index 39073a2d53..1cda46360a 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-fonts.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc
@@ -25,10 +25,10 @@
/*!
- \contentspage {Qt Design Studio}
+ \contentspage index.html
\previouspage qtquick-properties.html
- \page studio-fonts.html
- \nextpage studio-adding-dynamics.html
+ \page qtquick-fonts.html
+ \nextpage qtquick-adding-dynamics.html
\title Using Custom Fonts
diff --git a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
index b02dc93b18..898dd92569 100644
--- a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
@@ -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
diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc
index 8d9f653b5e..7b8066e4a3 100644
--- a/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc
@@ -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
diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
index 4686ef485b..38edb191dc 100644
--- a/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
@@ -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
diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc
index c93eaf4aaf..48c03e8a55 100644
--- a/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
- \contentspage {Qt Creator}
+ \contentspage index.html
\if defined(qtdesignstudio)
\previouspage studio-3d-camera.html
\else
diff --git a/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc
index 489a84da25..a3e8f875c0 100644
--- a/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc
@@ -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
diff --git a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc
index 3f6ef08d6a..95282b046e 100644
--- a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc
@@ -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
diff --git a/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc b/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc
index a613dc0f3a..049e0551e2 100644
--- a/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc
@@ -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
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-prototyping.qdoc b/doc/qtcreator/src/qtquick/qtquick-uis.qdoc
index d511c23359..1188d491a1 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-prototyping.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-uis.qdoc
@@ -24,17 +24,23 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio Manual}
+ \contentspage index.html
+ \page quick-uis.html
+ \if defined(qtdesignstudio)
\previouspage quick-converting-ui-projects.html
- \page studio-prototyping.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
@@ -45,7 +51,7 @@
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
+ \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.
@@ -76,7 +82,7 @@
\li \l {Using Custom Fonts}
- You can load custom fonts to \QDS and use them in your designs.
+ You can load custom fonts to \QMLD and use them in your designs.
\endlist
\section1 Related Topics
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc
index 0268fd04af..1261ee4d85 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc
@@ -25,7 +25,7 @@
/*!
- \contentspage {Qt Design Studio}
+ \contentspage index.html
\previouspage psqtbridge.html
\page qtbridge-ps-setup.html
\nextpage qtbridge-ps-using.html
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc
index 4c761b90d0..1f7a49d2e0 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc
@@ -25,7 +25,7 @@
/*!
- \contentspage {Qt Design Studio}
+ \contentspage index.html
\previouspage sketchqtbridge.html
\page qtbridge-sketch-setup.html
\nextpage qtbridge-sketch-using.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc
index b10c89527c..1b4fc73284 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio}
+ \contentspage index.html
\previouspage qt-design-viewer.html
\page studio-advanced.html
\nextpage studio-platforms.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc
new file mode 100644
index 0000000000..9b9bd85604
--- /dev/null
+++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Bridge 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 studio-importing-designs.html
+ \page studio-importing-2d.html
+ \nextpage studio-importing-3d.html
+
+ \title Importing 2D Assets
+
+ \image studio-imported-assets.png "Artwork imported into Qt Design Studio"
+
+ You can import assets that you exported with \QB to a \QDS project as image
+ and QML files and edit them in the Design mode. If you make changes to your
+ design in the design tool, you can merge the changes into existing QML files
+ without overwriting the changes you have made in \QDS.
+
+ \note Attempting to import assets exported on another system might fail.
+
+ The following instructions use an empty project as an example. For more
+ information about the options you have, see
+ \l {Creating Projects}.
+
+ To import designs to \QDS projects:
+
+ \list 1
+ \li Select \uicontrol File > \uicontrol {New File or Project} >
+ \uicontrol General > \uicontrol Choose, and follow the
+ instructions of the wizard to create an empty project.
+ \li In \uicontrol Projects, double-click \e Screen01.ui.qml to move to
+ the Design mode.
+ \li Select \uicontrol Library > \uicontrol Assets >
+ \uicontrol {Add New Assets}.
+ \li Select the folder where you exported the assets.
+ \li Select \uicontrol {Exported Assets (*.metadata)} in the dropdown
+ menu to filter \e .metadata files.
+ \li Select a \e .metadata file to import, and then select
+ \uicontrol Open.
+ \li Select \uicontrol Details next to the
+ \uicontrol {Metadata Import Paths} field to display the path where
+ the metadata is imported from.
+ \image studio-import-metadata.png "Asset Import dialog"
+ \li Select \uicontrol Details next to the
+ \uicontrol {QML/Asset Export Paths} field to display the paths to
+ copy the assets to.
+ \li In the \uicontrol QML field, you can change the folder to copy the
+ QML files to.
+ \li In the \uicontrol Assets field, you can change the folder to copy
+ the image files to.
+ \li Deselect the \uicontrol {Import assets} check box if you only want
+ to create QML files.
+ \li Deselect the \uicontrol {Generate QML} check box if you only
+ want to import assets.
+ \li Select the \uicontrol {Merge QML} check box if you have imported the
+ assets before and want to merge the changes into existing QML files
+ instead of overwriting the existing files.
+ \li Select \uicontrol Import to import the QML files and assets. This
+ might take a little while for complex projects.
+ \endlist
+
+ The imported assets are displayed in the \uicontrol Assets tab in the
+ \uicontrol Library as PNG images. The components that you specified in
+ the design tool are displayed in the \uicontrol {My QML Components} tab,
+ as well as in the \uicontrol Project tab of the \uicontrol Navigator as
+ separate QML files.
+
+ \note The layer that was the bottom layer in the design tool becames the top
+ layer in the \uicontrol Navigator to reflect the QML code model. You
+ can view the QML code in the \uicontrol {Text Editor} tab.
+
+ If asset importer conflicts, warnings, and errors are displayed in the
+ \uicontrol {Asset Import} dialog while importing, fix the issues in
+ design tool and export the assets again.
+
+ \section1 \QB Videos
+
+ For more information about importing assets from Adobe Photoshop, watch a
+ video tutorial and webinar about using \QB:
+
+ \list
+ \li \l{https://resources.qt.io/development-topic-ui-design/qtdesignstudio-clustertutorial-partone}
+ {Building an Instrument Cluster for Your Car HMI, Part 1}
+ \li \l{https://www.youtube.com/watch?v=ZzbucmQPU44}
+ {From Photoshop to Prototype with Qt Design Studio}
+ \endlist
+*/
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc
index ce53ae2ccd..8ad05eba81 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc
@@ -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 Bridge documentation.
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio}
+ \contentspage index.html
\previouspage creator-vcs-git.html
\page studio-importing-designs.html
\nextpage studio-importing-2d.html
@@ -47,131 +47,3 @@
You can then edit them in the Design mode.
\endlist
*/
-
-/*!
- \contentspage {Qt Design Studio}
- \previouspage studio-importing-designs.html
- \page studio-importing-2d.html
- \nextpage studio-importing-3d.html
-
- \title Importing 2D Assets
-
- \image studio-imported-assets.png "Artwork imported into Qt Design Studio"
-
- You can import assets that you exported with \QB to a \QDS project as image
- and QML files and edit them in the Design mode. If you make changes to your
- design in the design tool, you can merge the changes into existing QML files
- without overwriting the changes you have made in \QDS.
-
- \note Attempting to import assets exported on another system might fail.
-
- The following instructions use an empty project as an example. For more
- information about the options you have, see
- \l {Creating Projects}.
-
- To import designs to \QDS projects:
-
- \list 1
- \li Select \uicontrol File > \uicontrol {New File or Project} >
- \uicontrol General > \uicontrol Choose, and follow the
- instructions of the wizard to create an empty project.
- \li In \uicontrol Projects, double-click \e Screen01.ui.qml to move to
- the Design mode.
- \li Select \uicontrol Library > \uicontrol Assets >
- \uicontrol {Add New Assets}.
- \li Select the folder where you exported the assets.
- \li Select \uicontrol {Exported Assets (*.metadata)} in the dropdown
- menu to filter \e .metadata files.
- \li Select a \e .metadata file to import, and then select
- \uicontrol Open.
- \li Select \uicontrol Details next to the
- \uicontrol {Metadata Import Paths} field to display the path where
- the metadata is imported from.
- \image studio-import-metadata.png "Asset Import dialog"
- \li Select \uicontrol Details next to the
- \uicontrol {QML/Asset Export Paths} field to display the paths to
- copy the assets to.
- \li In the \uicontrol QML field, you can change the folder to copy the
- QML files to.
- \li In the \uicontrol Assets field, you can change the folder to copy
- the image files to.
- \li Deselect the \uicontrol {Import assets} check box if you only want
- to create QML files.
- \li Deselect the \uicontrol {Generate QML} check box if you only
- want to import assets.
- \li Select the \uicontrol {Merge QML} check box if you have imported the
- assets before and want to merge the changes into existing QML files
- instead of overwriting the existing files.
- \li Select \uicontrol Import to import the QML files and assets. This
- might take a little while for complex projects.
- \endlist
-
- The imported assets are displayed in the \uicontrol Assets tab in the
- \uicontrol Library as PNG images. The components that you specified in
- the design tool are displayed in the \uicontrol {My QML Components} tab,
- as well as in the \uicontrol Project tab of the \uicontrol Navigator as
- separate QML files.
-
- \note The layer that was the bottom layer in the design tool becames the top
- layer in the \uicontrol Navigator to reflect the QML code model. You
- can view the QML code in the \uicontrol {Text Editor} tab.
-
- If asset importer conflicts, warnings, and errors are displayed in the
- \uicontrol {Asset Import} dialog while importing, fix the issues in
- design tool and export the assets again.
-
- \section1 \QB Videos
-
- For more information about importing assets from Adobe Photoshop, watch a
- video tutorial and webinar about using \QB:
-
- \list
- \li \l{https://resources.qt.io/development-topic-ui-design/qtdesignstudio-clustertutorial-partone}
- {Building an Instrument Cluster for Your Car HMI, Part 1}
- \li \l{https://www.youtube.com/watch?v=ZzbucmQPU44}
- {From Photoshop to Prototype with Qt Design Studio}
- \endlist
-*/
-
-/*!
- \contentspage {Qt Design Studio}
- \previouspage studio-importing-2d.html
- \page studio-importing-3d.html
- \nextpage quick-converting-ui-projects.html
-
- \title Importing 3D Assets
-
- You can import files you created using 3D graphics applications and stored
- in 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}
- version, see the module documentation.
-
- For more information about exporting 3D graphics from Maya, see
- \l{Exporting from Maya}.
-
- During the import, you can optimize the files for \QDS. You can remove
- components from meshes to reduce the cache size, find and fix issues in
- the files, optimize graphs and meshes, and so on. The available options
- depend on whether you are importing files that you created with Qt 3D Studio
- or with other 3D graphics tools. See the tooltips in the options dialog
- for more information about a particular option.
-
- \image studio-import-3d.png
-
- To import 3D assets to \QDS projects:
-
- \list 1
- \li In the Design mode, select \uicontrol Library > \uicontrol Assets
- > \uicontrol {Add New Assets}.
- \li Select \uicontrol {3D Assets} in the dropdown menu to filter 3D
- graphics files.
- \li Select a file to import, and then select \uicontrol Open.
- \li In the \uicontrol {3D Scene Options} tab, select options for
- importing the file.
- \li Select \uicontrol Import to import the 3D graphics file.
- \li When the import is done, select \uicontrol Close.
- \endlist
-
- You can open the imported files in the Design mode for editing in the
- \l{Editing 3D Scenes}{3D editor}.
-*/
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc
index a0e5926adb..a182ba7951 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio}
+ \contentspage index.html
\previouspage creator-editor-options-text.html
\page studio-javascript.html
\nextpage studio-debugging.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc
index 2f48bdf68d..0e4e52a278 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio}
+ \contentspage index.html
\previouspage studio-advanced.html
\page studio-platforms.html
\nextpage creator-keyboard-shortcuts.html
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
index 4c7af21e01..b68214a15a 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio}
+ \contentspage index.html
\page qtdesignstudio-toc.html
\title All Topics
@@ -90,7 +90,7 @@
\li \l{Adding States}
\li \l{Editing PathView Properties}
\endlist
- \li \b {\l{Editing 3D Scenes}}
+ \li \l{Editing 3D Scenes}
\list
\li \l{Editing 3D Assets in Design Mode}
\li \l{Working in the 3D Editor}
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 e0cc8e0933..ce448c3f20 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
@@ -27,9 +27,13 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio}
+ \contentspage index.html
\page exporting-3d-assets.html
+ \if defined(qtdesignstudio)
\previouspage qtbridge-sketch-using.html
+ \else
+ \previouspage studio-3d.html
+ \endif
\nextpage exporting-from-blender.html
\title Exporting 3D Assets
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 53d3009a78..8903bc238a 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
@@ -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 Qt Design Studio.
@@ -26,10 +26,14 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio Manual}
+ \contentspage index.html
\page exporting-from-maya.html
- \previouspage qtbridge-sketch-using.html
+ \previouspage exporting-from-blender.html
+ \if defined (qtdesignstudio)
\nextpage creator-quick-tour.html
+ \else
+ \nextpage studio-importing-3d.html
+ \endif
\title Exporting from Maya
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc
index da2964d5ba..947e72cc25 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc
@@ -24,9 +24,13 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio}
- \previouspage studio-3d.html
+ \contentspage index.html
\page studio-3d-design-mode.html
+ \if defined (qtdesignstudio)
+ \previouspage studio-3d.html
+ \else
+ \previouspage studio-importing-3d.html
+ \endif
\nextpage studio-3d-editor.html
\title Editing 3D Assets in Design Mode
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
index 1e340182b5..71eedd4dfb 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio}
+ \contentspage index.html
\previouspage studio-3d-design-mode.html
\page studio-3d-editor.html
\nextpage studio-3d-view.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc
new file mode 100644
index 0000000000..17f7482233
--- /dev/null
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Bridge 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 studio-importing-3d.html
+ \if defined(qtdesignstudio)
+ \previouspage studio-importing-2d.html
+ \nextpage quick-converting-ui-projects.html
+ \else
+ \previouspage exporting-from-maya.html
+ \nextpage studio-3d-design-mode.html
+ \endif
+
+ \title Importing 3D Assets
+
+ You can import files you created using 3D graphics applications and stored
+ in 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}
+ version, see the module documentation.
+
+ For more information about exporting 3D graphics from Maya, see
+ \l{Exporting from Maya}.
+
+ During the import, you can optimize the files for \QDS. You can remove
+ components from meshes to reduce the cache size, find and fix issues in
+ the files, optimize graphs and meshes, and so on. The available options
+ depend on whether you are importing files that you created with Qt 3D Studio
+ or with other 3D graphics tools. See the tooltips in the options dialog
+ for more information about a particular option.
+
+ \image studio-import-3d.png
+
+ To import 3D assets to \QDS projects:
+
+ \list 1
+ \li In the Design mode, select \uicontrol Library > \uicontrol Assets
+ > \uicontrol {Add New Assets}.
+ \li Select \uicontrol {3D Assets} in the dropdown menu to filter 3D
+ graphics files.
+ \li Select a file to import, and then select \uicontrol Open.
+ \li In the \uicontrol {3D Scene Options} tab, select options for
+ importing the file.
+ \li Select \uicontrol Import to import the 3D graphics file.
+ \li When the import is done, select \uicontrol Close.
+ \endlist
+
+ You can open the imported files in the Design mode for editing in the
+ \l{Editing 3D Scenes}{3D editor}.
+*/
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc
index 211085fd3c..b9fb65731c 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio}
+ \contentspage index.html
\previouspage studio-3d-components.html
\page studio-3d-node.html
\nextpage studio-3d-model.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc
index 0951110886..3844439569 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc
@@ -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 Qt Design Studio.
@@ -29,7 +29,11 @@
\contentspage {Qt Design Studio Manual}
\page studio-3d-scene-environment.html
\previouspage studio-3d-camera.html
+ \if defined (qtdesignstudio)
\nextpage creator-live-preview.html
+ \else
+ \nextpage qtquick-iso-icon-browser.html
+ \endif
\title Setting Scene Environment
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
index 4c61d12a12..ae1e50e0d3 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
@@ -24,7 +24,7 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio}
+ \contentspage index.html
\previouspage studio-3d-editor.html
\page studio-3d-view.html
\nextpage studio-3d-components.html
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc
index 03f3085ad6..976ae9aca4 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc
@@ -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 Design Studio documentation.
@@ -24,10 +24,15 @@
****************************************************************************/
/*!
- \contentspage {Qt Design Studio Manual}
+ \contentspage index.html
\page studio-3d.html
\previouspage qmldesigner-pathview-editor.html
+ \if defined(qtdesignstudio)
\nextpage studio-3d-design-mode.html
+ \else
+ \nextpage exporting-3d-assets.html
+ \endif
+
\title Editing 3D Scenes
@@ -45,6 +50,20 @@
The following topics contain information about working with Qt Quick 3D:
\list
+ \if defined (qtcreator)
+ \li \l {Exporting 3D Assets}
+
+ You can import files you created using 3D graphics applications and
+ stored in several widely-used formats, such as .blend, .dae, .fbx,
+ .glb, .gltf, .obj, .uia, or .uip.
+
+ \li \l{Importing 3D Assets}
+
+ You can import 3D assets that you created using 3D graphics
+ applications and stored in one of the supported file formats.
+ You can then edit them in the Design mode.
+ \endif
+
\li \l {Editing 3D Assets in Design Mode}
\QDS opens QML files that contain 3D scenes in the Design mode and