summaryrefslogtreecommitdiffstats
path: root/src/doc/src
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-01-22 13:17:44 +0100
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-01-25 08:30:30 +0000
commitedcfa7aada9ff7edceb5808d3a7860256d4b91b7 (patch)
treef08b6f8c3ded446ae160b831b435d9cce8899ed7 /src/doc/src
parentd237b754d4a50b5e2e2aa3ef1f87f5dee9234983 (diff)
Doc: Use 'Qt 3D' instead of Qt3D consistently
Change-Id: I91c0d00c0116a05209239da399f4076316a51fc7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/doc/src')
-rw-r--r--src/doc/src/qt3d-index.qdoc4
-rw-r--r--src/doc/src/qt3d-overview.qdoc8
-rw-r--r--src/doc/src/qt3drender-module.qdoc5
3 files changed, 9 insertions, 8 deletions
diff --git a/src/doc/src/qt3d-index.qdoc b/src/doc/src/qt3d-index.qdoc
index 9c4255ac8..e97f83c02 100644
--- a/src/doc/src/qt3d-index.qdoc
+++ b/src/doc/src/qt3d-index.qdoc
@@ -47,7 +47,7 @@
\annotatedlist qt3d-modules
- For Qt Quick applications, Qt3D provides the following QML modules:
+ For Qt Quick applications, Qt 3D provides the following QML modules:
\annotatedlist qt3d-qmlmodules
@@ -79,7 +79,7 @@
\section1 Overview
- The high level design and motivation for Qt3D is described in the \l {Qt 3D
+ The high level design and motivation for Qt 3D is described in the \l {Qt 3D
Overview}. The Qt 3D Render aspect offers support for data-driven
configuration as described in \l {Qt 3D Render Framegraph}.
diff --git a/src/doc/src/qt3d-overview.qdoc b/src/doc/src/qt3d-overview.qdoc
index 331f508e6..2e1dd053f 100644
--- a/src/doc/src/qt3d-overview.qdoc
+++ b/src/doc/src/qt3d-overview.qdoc
@@ -42,7 +42,7 @@
applications.
Qt 3D provides a fully configurable renderer that enables developers to
- quickly implement any rendering pipeline that they need. Further, Qt3D
+ quickly implement any rendering pipeline that they need. Further, Qt 3D
provides a generic framework for near-realtime simulations beyond rendering.
Qt 3D is cleanly separated into a core and any number of \e aspects that can
@@ -163,7 +163,7 @@
\e Instancing is a way of getting the GPU to draw many copies (instances) of
a base object that varies in some way for each copy. Often, in position,
- orientation, color, material properties, scale, and so on. Qt3D provides an
+ orientation, color, material properties, scale, and so on. Qt 3D provides an
API similar to the Qt Quick \l Repeater element. In this case, the delegate
is the base object and the model provides the per-instance data. So whereas
an entity with a \l Mesh component attached eventually gets transformed into
@@ -196,7 +196,7 @@
\section1 3D Extensions
- Beyond the essentials of displaying 3D content on the screen, Qt3D is
+ Beyond the essentials of displaying 3D content on the screen, Qt 3D is
extensible and flexible enough to act as a host for following types of
extensions related to the 3D objects:
@@ -311,7 +311,7 @@
ignores it.
Qt 3D builds custom entities by aggregating components that provide
- additional capabilities. The Qt3D engine uses aspects to process and
+ additional capabilities. The Qt 3D engine uses aspects to process and
update entities with specific components.
For example, a physics aspect looks for entities that have some kind of
diff --git a/src/doc/src/qt3drender-module.qdoc b/src/doc/src/qt3drender-module.qdoc
index 7bab5cdf8..6cc53fe9d 100644
--- a/src/doc/src/qt3drender-module.qdoc
+++ b/src/doc/src/qt3drender-module.qdoc
@@ -37,14 +37,15 @@
/*!
\module Qt3DRender
\title Qt 3D Render C++ Classes
- \brief The Qt 3D Render module contains functionality to support 2D and 3D rendering using Qt3D.
+ \brief The Qt 3D Render module contains functionality to support 2D and 3D
+ rendering using Qt 3D.
\ingroup modules
\ingroup qt3d-modules
\qtvariable 3drender
The Qt 3D Render module provides an aspect, components, and other supporting types necessary
- to implement 2D and 3D rendering as part of the Qt3D framework.
+ to implement 2D and 3D rendering as part of the Qt 3D framework.
To use classes from this module, add this directive into the C++ files: