summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorJulian de Bhal <julian.debhal@nokia.com>2012-03-28 16:48:10 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-11 04:44:30 +0200
commitf4cad681ebbff438f3af5c45d5024fec3f407c95 (patch)
tree8d6015fb547afe809812ff2e8bcbd6f1cb2fb55b /doc/src
parent9981549d1550a6f19ad7353b73a33caa7db87825 (diff)
Minor doc fixes for the QtQuick3D to Qt3D rename.
Change-Id: Iccbd45f5155b4180b4ad4d0af9c1dadb1b0e3592 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/examples/basket.qdoc2
-rw-r--r--doc/src/examples/teapot.qdoc2
-rw-r--r--doc/src/images/icon-qt3d.xcfbin0 -> 28278 bytes
-rw-r--r--doc/src/index.qdoc2
-rw-r--r--doc/src/qt3d-building.qdoc2
-rw-r--r--doc/src/qt3d-contrib.qdoc4
6 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/examples/basket.qdoc b/doc/src/examples/basket.qdoc
index ba99c87cf..d199791dc 100644
--- a/doc/src/examples/basket.qdoc
+++ b/doc/src/examples/basket.qdoc
@@ -31,7 +31,7 @@
\section2 Basket in Qt3D
- The Qt3D version of the basket example is very similar in
+ The QML3D version of the basket example is very similar in
structure to the C++ version above, but much simpler.
We start by defining a viewport with a specific camera position:
diff --git a/doc/src/examples/teapot.qdoc b/doc/src/examples/teapot.qdoc
index acc0289cb..237e07665 100644
--- a/doc/src/examples/teapot.qdoc
+++ b/doc/src/examples/teapot.qdoc
@@ -31,7 +31,7 @@
The Teapot example shows how Qt3D can be used to draw a simple
teapot object with a perspective camera view in C++. There is
- also a \l{Teapot Example in Qt3D}{Qt3D version} of the teapot
+ also a \l{Teapot Example in Qt3D}{QML3D version} of the teapot
example.
We start by defining a class that inherits from QGLView, which
diff --git a/doc/src/images/icon-qt3d.xcf b/doc/src/images/icon-qt3d.xcf
new file mode 100644
index 000000000..31f2281ca
--- /dev/null
+++ b/doc/src/images/icon-qt3d.xcf
Binary files differ
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index f6889460d..4ce19ff38 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -103,7 +103,7 @@
\o \list
\o \l{qt3d-all-classes.html}{All Classes}
\o \l{All Namespaces}{QGL Namespace}
- \o \l{Qt3D for Scripting 3D Apps in QML}{QtQuick3D Elements}
+ \o \l{Qt3D for Scripting 3D Apps in QML}{QML/3D Elements}
\o \l{Stock Shapes for Qt3D}{QML/3D Stock Shapes}
\endlist
\endtable
diff --git a/doc/src/qt3d-building.qdoc b/doc/src/qt3d-building.qdoc
index 01809df19..bc71fe587 100644
--- a/doc/src/qt3d-building.qdoc
+++ b/doc/src/qt3d-building.qdoc
@@ -252,7 +252,7 @@
$ make -j 4
\endcode
- Note that the \c{$} above means the shell prompt (don't type the \{$}).
+ Note that the \c{$} above means the shell prompt (don't type the \c{$}).
The last line runs the example QML application \c{moon} to check that
the build went OK.
diff --git a/doc/src/qt3d-contrib.qdoc b/doc/src/qt3d-contrib.qdoc
index ac0305cfb..558a7ff1c 100644
--- a/doc/src/qt3d-contrib.qdoc
+++ b/doc/src/qt3d-contrib.qdoc
@@ -27,10 +27,10 @@
/*!
\page qt3d-contrib.html
- \title Contributing to Qt3D and Qt3D
+ \title Contributing to Qt3D
\keyword Contributing to Qt3D
- Qt3D and Qt3D are developed primarily in the Brisbane office of Qt
+ Qt3D is developed primarily in the Brisbane office of Qt
Development Frameworks, but anyone is welcome to join the effort with
patches, new examples, and major feature development.