Doc: Qt Quick: Fix module name format (Pt 2/2)

Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation

Attempt to differentiate between the whole module ("Qt Quick") and the
QML import ("QtQuick") by encoding the latter with monospace font. There
are places in the text where both representations are valid.

Change-Id: If398304757e0a5106542c09099e1814084e54c5c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

7 files changed, 12 insertions, 12 deletions

diff --git a/src/quick/doc/src/appdevguide/glossary.qdoc b/src/quick/doc/src/appdevguide/glossary.qdoc
index 2ece38256f..3c02918576 100644
--- a/src/quick/doc/src/appdevguide/glossary.qdoc
+++ b/src/quick/doc/src/appdevguide/glossary.qdoc
@@ -28,7 +28,7 @@
 /*!
 \page qtquick-glossary.html
 \title Qt Quick Glossary Of Terms
-\brief Glossary of terms used in the documentation for QML and QtQuick
+\brief Glossary of terms used in the documentation for QML and Qt Quick
 
 \section1 Common Terms
 
@@ -56,7 +56,7 @@
 
             The QML language provides a number of built in
             (\l{qtqml-typesystem-basictypes.html}{basic types}), and the
-            QtQuick module provides various \l{qtquick-qmltypereference.html}
+            Qt Quick module provides various \l{qtquick-qmltypereference.html}
             {Qt Quick types} for building QML applications. Types can also be
             provided by third-party developers through
             (\l{qtqml-modules-topic.html}{modules}) or by the application
diff --git a/src/quick/doc/src/appdevguide/porting.qdoc b/src/quick/doc/src/appdevguide/porting.qdoc
index c560a5cc08..eac50a9606 100644
--- a/src/quick/doc/src/appdevguide/porting.qdoc
+++ b/src/quick/doc/src/appdevguide/porting.qdoc
@@ -149,7 +149,7 @@ locations. The class name changes are as follows:
 \table
 \header
     \li Qt QML
-    \li QtQuick
+    \li Qt Quick
 \row
     \li
         \list
@@ -245,7 +245,7 @@ To use the \c {Qt Quick 1} module, add "quick1" to your qmake \c .pro file:
 QT += quick1
 \endcode
 
-Required header files can be included from the QtQuick 1 module:
+Required header files can be included from the Qt Quick 1 module:
 
 \code
 #include <QtQuick1/QDeclarativeView>
diff --git a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
index 7b8d66f2a6..7310d25929 100644
--- a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
+++ b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
@@ -28,7 +28,7 @@
 /*!
 \page qtquick-modelviewsdata-cppmodels.html
 \title Using C++ Models with Qt Quick Views
-\brief using QtQuick views with models defined in C++
+\brief using Qt Quick views with models defined in C++
 
 
 \section1 Data Provided In A Custom C++ Model
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index 413d5aae9c..43d6b952cb 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -259,7 +259,7 @@ Data Storage
 \li \l {ShaderEffect} - Allows GLSL shaders to be used as graphical effects
 \li \l {ShaderEffectSource} - Usable as a texture in ShaderEffect
 \li \l {GridMesh} - Generates a grid mesh of vertices for use by ShaderEffect
-\li The \l{QtQuick.Particles 2} module provides a set of Particle System types for QtQuick 2
+\li The \l{QtQuick.Particles 2} module provides a set of Particle System types for Qt Quick 2
 \endlist
 
 \section2 Convenience Types
diff --git a/src/quick/doc/src/whatsnew.qdoc b/src/quick/doc/src/whatsnew.qdoc
index c6f1196342..18ffff5e96 100644
--- a/src/quick/doc/src/whatsnew.qdoc
+++ b/src/quick/doc/src/whatsnew.qdoc
@@ -29,9 +29,9 @@
 \title Qt Quick Release Notes
 \page qtquick-releasenotes.html
 
-\section1 Qt 5.0 - QtQuick C++ Module
+\section1 Qt 5.0 - Qt Quick C++ Module
 
-The QtQuick C++ module is new in Qt 5. It provides the visual canvas and scenegraph back-end
+The Qt Quick C++ module is new in Qt 5. It provides the visual canvas and scenegraph back-end
 as well as the QtQuick QML module for QML application development.
 
 As of Qt 5, the \l {Qt Quick} module is based on an OpenGL scenegraph. Many of the classes in
@@ -344,11 +344,11 @@ the window loses focus.
 \section2 Property types
 
 Support for various math and geometry-related value types, including QVector2D, QVector3D, QVector4D,
-QMatrix4x4 and QQuaternion, as well as QColor and QFont, are now provided by QtQuick.  Properties of
+QMatrix4x4 and QQuaternion, as well as QColor and QFont, are now provided by Qt Quick.  Properties of
 these types can be declared in QML documents via the property syntax where the type name is \c vector2d,
 \c vector3d, \c vector4d, \c matrix4x4, \c quaternion, \c color and \c font respectively.
 
-QtQuick also provides implementation for the various value type factory or utility functions of the
+Qt Quick also provides implementation for the various value type factory or utility functions of the
 \c Qt object which return or operate on values of the above types.  The functions are:
 \table
   \header
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 1054da35c3..3efb1ae70d 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -760,7 +760,7 @@ void QQuickCanvasItem::getContext(QQmlV8Function *args)
 /*!
     \qmlmethod long QtQuick2::Canvas::requestAnimationFrame(callback)
 
-    This function schedules callback to be invoked before composing the QtQuick
+    This function schedules callback to be invoked before composing the Qt Quick
     scene.
 */
 
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp
index 4e3748f78f..2073bdc08d 100644
--- a/src/quick/util/qquickimageprovider.cpp
+++ b/src/quick/util/qquickimageprovider.cpp
@@ -242,7 +242,7 @@ QImage QQuickTextureFactory::image() const
     \c cache property to \c false for the relevant \l Image, \l BorderImage or
     \l AnimatedImage object.
 
-    The QtQuick 1 version of this class is named QDeclarativeImageProvider.
+    The Qt Quick 1 version of this class is named QDeclarativeImageProvider.
 
     \sa QQmlEngine::addImageProvider()
 */