Doc: Fix some titles and links

Make page titles follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation.

Make class/type list titles follow the "<Qt Module> C++ Classes" and
"<Qt Module> QML Types" formats.

Links are updated accordingly, along with broken links found during this
sweep. Some inline links also have their surrounding text modified, to
improve flow.

Change-Id: I0ed7788caa250085d7ea0080a77d8a2655debf39
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

4 files changed, 8 insertions, 10 deletions

diff --git a/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc b/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc
index 0b9af98083..c1b5a937a0 100644
--- a/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc
+++ b/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc
@@ -128,7 +128,7 @@ provided by Qt Quick, please see the \l{Qt Quick} module documentation.
     \list
     \li \l{qtquick-qmlscene.html}{Prototyping with qmlscene}
     \li \l{qtquick-debugging.html}{Debugging QML Applications}
-    \li \l{qtquick-qtquicktest.html}{QtQuickTest: QML Unit Testing Framework}
+    \li \l{qtquick-qtquicktest.html}{Qt Quick Test: QML Unit Testing Framework}
     \endlist
 \li \l{qml-codingconventions.html}{QML Coding Conventions}
 \li \l{qtquick-glossary.html}{Glossary of Terms}
diff --git a/src/quick/doc/src/appdevguide/porting.qdoc b/src/quick/doc/src/appdevguide/porting.qdoc
index dcc864179b..907f7403b9 100644
--- a/src/quick/doc/src/appdevguide/porting.qdoc
+++ b/src/quick/doc/src/appdevguide/porting.qdoc
@@ -36,7 +36,7 @@ these changes and the impact they have on your existing code.
 
 This article describes the changes that affect your existing code. If you are
 interested in the summary of all new features in Qt 5 for QML application development, see
-\l{qtqml-releasenotes.html}{QtQml Release Notes} and \l{qtquick-releasenotes.html}{QtQuick Release Notes}.
+\l{Qt QML Release Notes} and \l{Qt Quick Release Notes}.
 
 \section1 QML Language changes
 
diff --git a/src/quick/doc/src/appdevguide/qtquicktest.qdoc b/src/quick/doc/src/appdevguide/qtquicktest.qdoc
index e26cf10a84..6d434279e6 100644
--- a/src/quick/doc/src/appdevguide/qtquicktest.qdoc
+++ b/src/quick/doc/src/appdevguide/qtquicktest.qdoc
@@ -28,8 +28,7 @@
 /*!
     \page qtquick-qtquicktest.html
     \inqmlmodule QtQuick 2
-    \title QtQuickTest Reference Documentation
-    \keyword QtQuickTest Reference Documentation
+    \title Qt Quick Test Reference Documentation
     \brief unit testing framework for QML
 
     \section1 Introduction
diff --git a/src/quick/doc/src/appdevguide/quickstart/basics.qdoc b/src/quick/doc/src/appdevguide/quickstart/basics.qdoc
index ef30f1682d..15f3c2f5ff 100644
--- a/src/quick/doc/src/appdevguide/quickstart/basics.qdoc
+++ b/src/quick/doc/src/appdevguide/quickstart/basics.qdoc
@@ -34,25 +34,25 @@
 A QML document defines a hierarchy of objects with a highly-readable,
 structured layout.  Every QML document consists of two parts: an imports
 section and an object declaration section.  The types and functionality most
-common to user interfaces are provided in the \l{QtQuick}
+common to user interfaces are provided in the \c{QtQuick}
 import.
 
 \section2 Importing and Using the QtQuick Module
 
-To use the \l{QtQuick} module, a QML document needs to
+To use the \l{Qt Quick} module, a QML document needs to
 import it.  The import syntax looks like this:
 
 \qml
 import QtQuick 2.0
 \endqml
 
-The types and functionality that \l{QtQuick} provides can now
+The types and functionality that \l{Qt Quick} provides can now
 be used in the QML document!
 
 \section2 Defining an Object Hierarchy
 
 The object declaration in a QML document defines what will be displayed in the
-visual scene.  \l{QtQuick} provides the basic building blocks
+visual scene.  \l{Qt Quick} provides the basic building blocks
 for all user interfaces, including objects to display images and text, and to
 handle user input.
 
@@ -80,8 +80,7 @@ added to the \c children property of the \l Rectangle object, by QML.
 \section2 Putting it Together
 
 The \l Rectangle and \l Text types used in the above example are both provided
-by the \l{QtQuick} import.  To use them, we need to import
-\l{QtQuick}.  Putting the import and object declaration
+by the \c{QtQuick} import.  Putting the import and object declaration
 together, we get a complete QML document:
 
 \qml