aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2020-05-13 16:12:26 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2020-05-15 08:04:05 +0000
commit3819b766a47db1e31e13d1faa572fe9a83ac0dc9 (patch)
treec7ef7f1ee79db9baa4900ec25c1689963fc25c95
parent1d257e60d13e39a5b2b7282231d26c0e59d895ff (diff)
Doc: Update information about project wizards
Qt Quick 3D, Flow Item and Flow view wizards have been added, the Qt for MCUs wizard is now included in Qt Design Studio, and the font loader wizard has been removed. Task-number: QDS-2056 Change-Id: Ie5d42320661977d57767c3bf58fd480e7d6c3c8d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc16
-rw-r--r--doc/qtdesignstudio/images/studio-project-wizards.pngbin33200 -> 15718 bytes
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc3
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc42
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc32
5 files changed, 49 insertions, 44 deletions
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
index 0866481120..2ff19db916 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
@@ -102,18 +102,18 @@
\list
\li Qt Quick Application - Empty
- Create an empty Qt Quick application that uses Qt Quick 2 types.
+ Create an empty \l{Qt Quick} application that uses Qt Quick 2
+ types.
You can build the application and deploy it to desktop,
embedded, and mobile target platforms.
\li Qt Quick Application - Scroll, Stack, or Swipe
- Create a Qt Quick application that uses
- \l{http://doc.qt.io/qt-5/qtquickcontrols2-index.html}
- {Qt Quick Controls} to implement a scrollable list (requires
- Qt 5.9 or later) or a set of pages with a stack-based or
- swipe-based navigation model (requires Qt 5.7 or later).
+ Create a Qt Quick application that uses \l{Qt Quick Controls} to
+ implement a scrollable list (requires Qt 5.9 or later) or a set
+ of pages with a stack-based or swipe-based navigation model
+ (requires Qt 5.7 or later).
\endlist
\li Application (Qt)
@@ -150,8 +150,8 @@
\list
\li MCU Support Application
- Creates an application that uses a subset of QML and
- Qt Quick Controls (as supported by Qt for MCUs) that
+ Creates an application that uses a subset of Qt QML and
+ Qt Quick Controls types (as supported by Qt for MCUs) that
you can deploy, run, and debug on MCU boards. For more
information, see \l {Connecting MCUs}.
\endlist
diff --git a/doc/qtdesignstudio/images/studio-project-wizards.png b/doc/qtdesignstudio/images/studio-project-wizards.png
index 29a31a2e14..bdfb78546a 100644
--- a/doc/qtdesignstudio/images/studio-project-wizards.png
+++ b/doc/qtdesignstudio/images/studio-project-wizards.png
Binary files differ
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc
index c09078339f..036879ad63 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc
@@ -46,8 +46,7 @@
You can use wizards to create projects for the desktop or embedded
Linux and Android devices. In addition, you can add individual QML
- files, components, font loaders, and JavaScript files to your
- projects.
+ files, components, and JavaScript files to your projects.
\li \l{Using Git}
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc
index f98f53349b..c545d0dab2 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-projects.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.
@@ -63,15 +63,22 @@
or create them from scratch using the following wizards:
\list
- \li \uicontrol General generates projects that are suitable for all
- target platforms.
- \omit
- \li \uicontrol Embedded generates projects that work well on embedded
- Linux devices.
- \endomit
- \li \uicontrol Mobile generates projects that work well on mobile
- devices.
- \li \uicontrol Desktop generates projects that work well on the desktop.
+ \li \uicontrol {MCU Support Application} creates an application that
+ uses a subset of \l{Qt QML} and \l{Qt Quick Controls} types (as
+ supported by Qt for MCUs) that you can deploy, run, and debug on
+ MCU boards.
+ \li \uicontrol {Qt Quick Application - Empty} creates a Qt Quick UI
+ project that uses \l{Qt Quick} types and can be run on all target
+ platforms.
+ \li \uicontrol {Qt Quick 3D Application} creates a Qt Quick UI project
+ that uses Qt Quick and \l{Qt Quick 3D} types.
+ \li \uicontrol {Qt Quick Application - Scroll} and
+ \uicontrol {Qt Quick Application - Stack} create a Qt Quick
+ application that uses Qt Quick Controls to implement a scrollable
+ list or a set of pages with a stack-based navigation model.
+ \li \uicontrol {Qt Quick Application - Launcher} creates a Qt Quick UI
+ project that uses Qt Quick types and defines a QML laucher
+ application.
\endlist
\section1 Using Project Wizards
@@ -119,10 +126,12 @@
\list
\li \uicontrol {Qt Quick Files}
\list
+ \li \uicontrol {Flow Item} and \uicontrol {Flow View} generate
+ types that you can use to design the application flow.
\li \uicontrol {Qt Quick File} generates a QML type with one
of the following types as the root item: \l Item,
\l Rectangle, \l Image, \l BorderImage, \l Flickable,
- \l Row, \l Column, \l Flow, or \li Grid.
+ \l Row, \l Column, \l Flow, or \l Grid.
\li \uicontrol {Qt Quick UI File} generates a UI form with one
of the above types as the root item.
\li \uicontrol {Qt Quick Views} generates a \l GridView or a
@@ -141,17 +150,12 @@
\li \l [Qt Quick Controls 2] {SwipeView} enables users to
navigate pages by swiping sideways.
\endlist
- \li \uicontrol {QML Files}
- \list
- \li \l FontLoader imports custom fonts to the project for
- deployment to devices. For more information, see
- \l {Using Custom Fonts}.
- \li \l ListModel adds a list model to the project.
- \endlist
+ \li \uicontrol ListModel adds a \l{ListModel}{list model} to the
+ project.
\li \uicontrol {JavaScript File} generates files that you can use to
write the application logic. This is useful for testing the
application before the developers implement the application logic
in C++, for example. For more information, see
\l {Simulating Application Logic}.
- \endlist
+ \endlist
*/
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
index de74979357..3cc6c92d2f 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
@@ -30,32 +30,34 @@
\title Adding 3D Views
- To display \l {Qt Quick 3D} types in the \uicontrol Library, select
- \uicontrol Library > \uicontrol {QML Imports} > \uicontrol {Add Import} >
- \uicontrol QtQuick3D. The types are displayed in the \uicontrol {QML Types}
- tab.
+ You can use a wizard to create a Qt Quick 3D UI project that imports
+ the \l{Qt Quick 3D} QML types to the \uicontrol {QML Types} tab in
+ \uicontrol Library and contains a 3D view, scene light, camera, and
+ model. A default material is attached to the model. You can attach
+ textures to materials. For more information about creating projects,
+ see \l{Creating Projects}.
+
+ To add a 3D view to some other kind of project and to display the Qt Quick
+ 3D QML types in \uicontrol Library, select \uicontrol Library >
+ \uicontrol {QML Imports} > \uicontrol {Add Import} > \uicontrol QtQuick3D.
\image studio-qtquick-3d-components.png
- To add a 3D view to the scene, drag and drop a \uicontrol {View 3D}
- component from \uicontrol Library > \uicontrol {QML Types} >
- \uicontrol {Qt Quick 3D} to the 3D editor or to the \uicontrol Navigator.
- A 3D view contains a reference node that specifies a scene light, camera,
- and model. A default material is attached to the model. You can attach
- textures to materials.
+ To add components to the scene, drag and drop them to \uicontrol Navigator
+ or \uicontrol {Form Editor}.
\image studio-navigator-view3d.png "View 3D component in the Navigator"
By default, a directional light and a perspective camera are used.
- To use other light and camera types, change the type of the component in
- the \uicontrol Type field in the \uicontrol Properties view. For example,
+ To use other light and camera types, change the type of the component
+ in the \uicontrol Type field in \uicontrol Properties. For example,
to use a point light, enter \e {PointLight}.
\image studio-3d-properties-type.png "Type field in Properties view"
- To edit component properties, select the component in the 3D editor
- or in the \uicontrol Navigator and modify the property values in the
- \uicontrol Properties view.
+ To edit component properties, select the component in
+ \uicontrol {Form Editor} or \uicontrol Navigator and
+ modify the property values in \uicontrol Properties.
\image studio-qtquick-3d-view.png "View 3D component properties"