Minor doc fixes for the QtQuick3D to Qt3D rename.

Change-Id: Iccbd45f5155b4180b4ad4d0af9c1dadb1b0e3592
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

9 files changed, 11 insertions, 11 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
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.
 
diff --git a/qtc_packaging/debian_harmattan/README b/qtc_packaging/debian_harmattan/README
index 904d60d54..06563821b 100644
--- a/qtc_packaging/debian_harmattan/README
+++ b/qtc_packaging/debian_harmattan/README
@@ -7,7 +7,7 @@ Building Qt3D
 ==================
 
 Check the building instructions in doc/src/qt3d-building.qdoc also available
-online at: http://doc.qt.nokia.com/qt-quick3d-snapshot/qt3d-building.html
+online at: http://doc-snapshot.qt-project.org/qt3d-1.0/qt3d-building.html
 
 
 Whats in Qt3D
diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
index e7255c6fc..5b2086110 100755
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@ -28,7 +28,7 @@
 # export SYSROOT_DIR=$MADDE/sysroots/harmattan-meego-arm-sysroot-1122-slim
 #
 # ### Step 3: copy all the stuff across - cannot shadow build (probably don't want git)
-# (cd ~/depot/qt/quick3d && tar cf - --exclude-vcs .)|(cd pkg && tar xf -)
+# (cd ~/source/qt/qt3d && tar cf - --exclude-vcs .)|(cd pkg && tar xf -)
 # cd pkg
 # cp -f -v qtc_packaging/debian_harmattan/* debian/.
 #
@@ -69,7 +69,7 @@ build-stamp: configure-stamp
 
 	# Add here commands to compile the package.
     # $(DEB_MAKE_INVOKE) # Uncomment this line for use without Qt Creator
-	#docbook-to-man debian/quick3d.sgml > quick3d.1
+        #docbook-to-man debian/qt3d.sgml > qt3d.1
 
 	touch $@
 
diff --git a/src/scripts/build_win_package.nsi b/src/scripts/build_win_package.nsi
index ea8fb7de6..f6565db1c 100644
--- a/src/scripts/build_win_package.nsi
+++ b/src/scripts/build_win_package.nsi
@@ -111,6 +111,8 @@ Section "MainSection" SEC01
   CreateShortCut "$SMPROGRAMS\Qt3D\Examples\Photo Room.lnk" "$INSTDIR\qt3d\bin\photoroom.exe"
   CreateShortCut "$SMPROGRAMS\Qt3D\Examples\Shaders.lnk" "$INSTDIR\qt3d\bin\shaders.exe"
   CreateShortCut "$SMPROGRAMS\Qt3D\Examples\Sphere.lnk" "$INSTDIR\qt3d\bin\sphere.exe"
+  CreateShortCut "$SMPROGRAMS\Qt3D\Examples\Teapot.lnk" "$INSTDIR\qt3d\bin\teapot_qml.exe"
+  CreateShortCut "$SMPROGRAMS\Qt3D\Examples\Teapot Bounce.lnk" "$INSTDIR\qt3d\bin\teapot_bounce_qml.exe"
   CreateShortCut "$SMPROGRAMS\Qt3D\Examples\Basket (C++).lnk" "$INSTDIR\qt3d\bin\basket.exe"
   CreateShortCut "$SMPROGRAMS\Qt3D\Examples\Builder.lnk" "$INSTDIR\qt3d\bin\builder.exe"
   CreateShortCut "$SMPROGRAMS\Qt3D\Examples\Cube (C++).lnk" "$INSTDIR\qt3d\bin\cube.exe"
@@ -195,8 +197,6 @@ Section Uninstall
   Delete "$INSTDIR\mkspecs\features\qt3d.prf"
   Delete "$INSTDIR\lib\Qt3D.*"
   Delete "$INSTDIR\lib\Qt3Dd.*"
-  Delete "$INSTDIR\lib\Qt3D.*"
-  Delete "$INSTDIR\lib\Qt3Dd.*"
   Delete "$INSTDIR\bin\Qt3D.*"
   Delete "$INSTDIR\bin\Qt3Dd.*"
   Delete "$INSTDIR\bin\Qt3D.*"