Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (53 commits)
  Be consistent in conversion from string (eg. color, int rounding).
  Simplify code to make next change clearer.
  Stop warnings.
  Improve error messages when tests fail.
  Stop highlight animators for highlightFollowsCurrentItem: false
  Ensure valuetype enums can be assigned from JS
  Improve testcase
  Rename Component::errorsString() -> errorString() (and also for
  Fixes for docs, example code
  Make test more stable
  Autotest (XFAIL) for QTBUG-10822
  Add return value for resolveTypeInNamespace
  Fix test
  Fix test. Missed files.
  Missing break
  Create overview page for examples for Extending QML in C++
  Search for QML import libraries also in application directory
  Doc improvements
  Disable mouse-based selection in TextInput/TextEdit
  Rename qml executable to qmlviewer
  ...

10 files changed, 63 insertions, 334 deletions

diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index cdc308a..a355f9f 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -75,14 +75,13 @@ For example, from your build directory, run:
 \list
 \o \l{declarative/animation/basics}{Basics}
 \o \l{declarative/animation/behaviors}{Behaviors}
-\o \l{declarative/animation/easing}{Easing}
+\o \l{declarative/animation/easing}{Easing types}
 \o \l{declarative/animation/states}{States}
 \endlist
 
 \section2 Image Elements
 \list
 \o \l{declarative/imageelements/borderimage}{BorderImage}
-\o \l{declarative/imageelements/image}{Image}
 \endlist
 
 \section2 \l{declarative/positioners}{Positioners}
@@ -122,7 +121,6 @@ For example, from your build directory, run:
 
 \section2 XML
 \list
-\o \l{declarative/xml/xmldata}{XML data}
 \o \l{declarative/xml/xmlhttprequest}{XmlHttpRequest}
 \endlist
 
@@ -138,22 +136,22 @@ For example, from your build directory, run:
 
 \section2 C++ Extensions
 \list
-\o \l{declarative/cppextensions/referenceexamples}{Reference examples} (discussed in \l {Extending QML in C++})
+\o \l{declarative-cppextensions-reference.html}{Reference examples} (discussed in \l {Extending QML in C++})
 \o \l{declarative/cppextensions/plugins}{Plugins}
-\o \l{declarative/cppextensions/proxywidgets}{QtWidgets}
-\o \l{declarative/cppextensions/qgraphicslayouts}{QGraphicsLayouts}
+\o \l{declarative-cppextensions-qgraphicslayouts.html}{QGraphicsLayouts}
+\o \l{declarative/cppextensions/qwidgets}{QWidgets}
 \o \l{declarative/cppextensions/imageprovider}{Image provider}
-\o \l{declarative/cppextensions/proxyviewer}{Network access manager factory}
+\o \l{declarative/cppextensions/networkaccessmanagerfactory}{Network access manager factory}
 \endlist
 
 \section2 Toys
 \list
 \o \l{declarative/toys/clocks}{Clocks}
+\o \l{declarative/toys/corkboards}{Corkboards}
 \o \l{declarative/toys/dial}{Dial}
-\o \l{declarative/toys/dynamic}{Dynamic}
+\o \l{declarative/toys/dynamicscene}{Dynamic Scene}
 \o \l{declarative/toys/tic-tac-toe}{Tic Tac Toe}
 \o \l{declarative/toys/tvtennis}{TV Tennis}
-\o \l{declarative/toys/velocity}{Velocity}
 \endlist
 
 
@@ -161,12 +159,19 @@ For example, from your build directory, run:
 
 \list
 \o \l{demos/declarative/calculator}{Calculator}
+\o \l{demos/declarative/flickr}{Flickr Mobile}
 \o \l{demos/declarative/minehunt}{Minehunt}
 \o \l{demos/declarative/photoviewer}{Photo Viewer}
-\o \l{demos/declarative/flickr}{Flickr Mobile}
+\o \l{demos/declarative/rssnews}{RSS News Reader}
 \o \l{demos/declarative/samegame}{Same Game}
 \o \l{demos/declarative/snake}{Snake}
 \endlist
 
+\section1 Labs
+
+\list
+\o \l{src/imports/folderlistmodel}{Folder List Model} - a C++ model plugin
+\endlist
+
 */
 
diff --git a/doc/src/declarative/extending-examples.qdoc b/doc/src/declarative/extending-examples.qdoc
deleted file mode 100644
index 577ab78..0000000
--- a/doc/src/declarative/extending-examples.qdoc
+++ /dev/null
@@ -1,302 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-\example declarative/cppextensions/referenceexamples/adding
-\title Extending QML - Adding Types Example
-
-The Adding Types Example shows how to add a new element type, \c Person, to QML.
-The \c Person type can be used from QML like this:
-
-\snippet examples/declarative/cppextensions/referenceexamples/adding/example.qml 0
-
-\section1 Declare the Person class
-
-All QML elements map to C++ types.  Here we declare a basic C++ Person class 
-with the two properties we want accessible on the QML type - name and shoeSize.
-Although in this example we use the same name for the C++ class as the QML 
-element, the C++ class can be named differently, or appear in a namespace.
-
-\snippet examples/declarative/cppextensions/referenceexamples/adding/person.h 0
-
-\section1 Define the Person class
-
-\snippet examples/declarative/cppextensions/referenceexamples/adding/person.cpp 0
-
-The Person class implementation is quite basic.  The property accessors simply
-return members of the object instance.
-
-The \c main.cpp file also calls the \c qmlRegisterType() function to
-register the \c Person type with QML as a type in the People library version 1.0,
-and defines the mapping between the C++ and QML class names.
-
-\section1 Running the example
-
-The main.cpp file in the example includes a simple shell application that 
-loads and runs the QML snippet shown at the beginning of this page.  
-*/
-
-/*!
-\example declarative/cppextensions/referenceexamples/properties
-\title Extending QML - Object and List Property Types Example
-
-This example builds on:
-\list
-\o \l {Extending QML - Adding Types Example}
-\endlist
-
-The Object and List Property Types example shows how to add object and list
-properties in QML.  This example adds a BirthdayParty element that specifies
-a birthday party, consisting of a celebrant and a list of guests.  People are
-specified using the People QML type built in the previous example.
-
-\snippet examples/declarative/cppextensions/referenceexamples/properties/example.qml 0
-
-\section1 Declare the BirthdayParty
-
-The BirthdayParty class is declared like this:
-
-\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 0
-\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 1
-\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 2
-\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 3
-
-The class contains a member to store the celebrant object, and also a 
-QList<Person *> member.  
-
-In QML, the type of a list properties - and the guests property is a list of 
-people - are all of type QDeclarativeListProperty<T>.  QDeclarativeListProperty is simple value
-type that contains a set of function pointers.  QML calls these function 
-pointers whenever it needs to read from, write to or otherwise interact with
-the list.  In addition to concrete lists like the people list used in this
-example, the use of QDeclarativeListProperty allows for "virtual lists" and other advanced
-scenarios.
-
-\section2 Define the BirthdayParty
-
-The implementation of BirthdayParty property accessors is straight forward.
-
-\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp 0
-
-\section1 Running the example
-
-The main.cpp file in the example includes a simple shell application that 
-loads and runs the QML snippet shown at the beginning of this page.  
-*/
-
-/*!
-\example declarative/cppextensions/referenceexamples/coercion
-\title Extending QML - Inheritance and Coercion Example
-
-This example builds on:
-\list
-\o \l {Extending QML - Object and List Property Types Example}
-\o \l {Extending QML - Adding Types Example}
-\endlist
-
-The Inheritance and Coercion Example shows how to use base classes to assign
-elements of more than one type to a property.  It specializes the Person element
-developed in the previous examples into two elements - a \c Boy and a \c Girl.
-
-\snippet examples/declarative/cppextensions/referenceexamples/coercion/example.qml 0
-
-\section1 Declare Boy and Girl
-
-\snippet examples/declarative/cppextensions/referenceexamples/coercion/person.h 0
-
-The Person class remains unaltered in this example and the Boy and Girl C++ 
-classes are trivial extensions of it.  As an example, the inheritance used here
-is a little contrived, but in real applications it is likely that the two
-extensions would add additional properties or modify the Person classes 
-behavior.
-
-\section2 Define People as a base class
-
-The implementation of the People class itself has not changed since the the 
-previous example.  However, as we have repurposed the People class as a common
-base for Boy and Girl, we want to prevent it from being instantiated from QML
-directly - an explicit Boy or Girl should be instantiated instead.
-
-\snippet examples/declarative/cppextensions/referenceexamples/coercion/main.cpp 0
-
-While we want to disallow instantiating Person from within QML, it still needs
-to be registered with the QML engine, so that it can be used as a property type
-and other types can be coerced to it.
-
-\section2 Define Boy and Girl
-
-The implementation of Boy and Girl are trivial.
-
-\snippet examples/declarative/cppextensions/referenceexamples/coercion/person.cpp 1
-
-All that is necessary is to implement the constructor, and to register the types
-and their QML name with the QML engine.
-
-\section1 Running the example
-
-The BirthdayParty element has not changed since the previous example.  The 
-celebrant and guests property still use the People type.  
-
-\snippet examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h 0
-
-However, as all three types, Person, Boy and Girl, have been registered with the
-QML system, on assignment QML automatically (and type-safely) converts the Boy
-and Girl objects into a Person.
-
-The main.cpp file in the example includes a simple shell application that 
-loads and runs the QML snippet shown at the beginning of this page.  
-*/
-
-/*!
-\example declarative/cppextensions/referenceexamples/default
-\title Extending QML - Default Property Example
-
-This example builds on:
-\list
-\o \l {Extending QML - Inheritance and Coercion Example}
-\o \l {Extending QML - Object and List Property Types Example}
-\o \l {Extending QML - Adding Types Example}
-\endlist
-
-The Default Property Example is a minor modification of the 
-\l {Extending QML - Inheritance and Coercion Example} that simplifies the 
-specification of a BirthdayParty through the use of a default property.
-
-\snippet examples/declarative/cppextensions/referenceexamples/default/example.qml 0
-
-\section1 Declaring the BirthdayParty class
-
-The only difference between this example and the last, is the addition of the
-\c DefaultProperty class info annotation.  
-
-\snippet examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h 0
-
-The default property specifies the property to assign to whenever an explicit 
-property is not specified, in the case of the BirthdayParty element the guest
-property.  It is purely a syntactic simplification, the behavior is identical 
-to specifying the property by name, but it can add a more natural feel in many
-situations.  The default property must be either an object or list property.
-
-\section1 Running the example
-
-The main.cpp file in the example includes a simple shell application that 
-loads and runs the QML snippet shown at the beginning of this page.  
-*/
-
-/*!
-\example declarative/cppextensions/referenceexamples/grouped
-\title Extending QML - Grouped Properties Example
-
-This example builds on:
-\list
-\o \l {Extending QML - Default Property Example}
-\o \l {Extending QML - Inheritance and Coercion Example}
-\o \l {Extending QML - Object and List Property Types Example}
-\o \l {Extending QML - Adding Types Example}
-\endlist
-
-*/
-
-/*!
-\example declarative/cppextensions/referenceexamples/grouped
-\title Extending QML - Attached Properties Example
-
-This example builds on:
-\list
-\o \l {Extending QML - Grouped Properties Example}
-\o \l {Extending QML - Default Property Example}
-\o \l {Extending QML - Inheritance and Coercion Example}
-\o \l {Extending QML - Object and List Property Types Example}
-\o \l {Extending QML - Adding Types Example}
-\endlist
-
-*/
-
-/*!
-\example declarative/cppextensions/referenceexamples/signal
-\title Extending QML - Signal Support Example
-
-This example builds on:
-\list
-\o \l {Extending QML - Attached Properties Example}
-\o \l {Extending QML - Grouped Properties Example}
-\o \l {Extending QML - Default Property Example}
-\o \l {Extending QML - Inheritance and Coercion Example}
-\o \l {Extending QML - Object and List Property Types Example}
-\o \l {Extending QML - Adding Types Example}
-\endlist
-
-*/
-
-/*!
-\example declarative/cppextensions/referenceexamples/valuesource
-\title Extending QML - Property Value Source Example
-
-This example builds on:
-\list
-\o \l {Extending QML - Signal Support Example}
-\o \l {Extending QML - Attached Properties Example}
-\o \l {Extending QML - Grouped Properties Example}
-\o \l {Extending QML - Default Property Example}
-\o \l {Extending QML - Inheritance and Coercion Example}
-\o \l {Extending QML - Object and List Property Types Example}
-\o \l {Extending QML - Adding Types Example}
-\endlist
-
-*/
-
-/*!
-\example declarative/cppextensions/referenceexamples/binding
-\title Extending QML - Binding Example
-
-This example builds on:
-\list
-\o \l {Extending QML - Property Value Source Example}
-\o \l {Extending QML - Signal Support Example}
-\o \l {Extending QML - Attached Properties Example}
-\o \l {Extending QML - Grouped Properties Example}
-\o \l {Extending QML - Default Property Example}
-\o \l {Extending QML - Inheritance and Coercion Example}
-\o \l {Extending QML - Object and List Property Types Example}
-\o \l {Extending QML - Adding Types Example}
-\endlist
-
-*/
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 5b695f7..574b0b2 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -61,8 +61,11 @@ QML for their own independent use.
 The QML snippet shown above instantiates one \c Person instance and sets
 the \c name and \c shoeSize properties on it.  Everything in QML ultimately comes down
 to either instantiating an object instance, or assigning a property a value.
+
 QML relies heavily on Qt's meta object system and can only instantiate classes
-that derive from QObject.
+that derive from QObject. For visual element types, this will usually mean a subclass
+of QDeclarativeItem; for models used with the view elements, a subclass of QAbstractItemModel;
+and for abitrary objects with properties, a direct subclass of QObject.
 
 The QML engine has no intrinsic knowledge of any class types.  Instead the
 programmer must register the C++ types with their corresponding QML names.
diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index e2b8bb6..4c4a317 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -67,7 +67,12 @@ item and thus subsequently be \l {QEvent::ignore()}{ignored}.
 \code
 Item {
     Item {
-        Keys.onPressed: if (event.key == Qt.Key_A) { console.log('Key A was pressed'); event.accepted = true }
+        Keys.onPressed: {
+            if (event.key == Qt.Key_A) { 
+                console.log('Key A was pressed');
+                event.accepted = true;
+            }
+        }
         Rectangle {}
     }
 }
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 2a83e30..bd0a9f5 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -219,8 +219,9 @@ Binary to ASCII - this function returns a base64 encoding of \c data.
 ASCII to binary - this function returns a base64 decoding of \c data.
 
 \section3 Qt.quit()
-This function causes the QML engine to emit the quit signal, which in
-\l {Qt Declarative UI Runtime}{qml} causes the runtime to quit.
+This function causes the QDeclarativeEngine::quit() signal to be emitted.
+Within the \l {Qt Declarative UI Runtime}{qml} application this causes the 
+launcher application to exit.
 
 \section3 Qt.resolvedUrl(url)
 This function returns \c url resolved relative to the URL of the
@@ -257,7 +258,7 @@ If you are certain the files will be local, you could simplify to:
 The methods and properties of the Component element are defined in its own
 page, but when using it dynamically only two methods are usually used.
 \c Component.createObject() returns the created object or \c null if there is an error.
-If there is an error, \l {Component::errorsString()}{Component.errorsString()} describes
+If there is an error, \l {Component::errorString()}{Component.errorString()} describes
 the error that occurred. Note that createObject() takes exactly one argument, which is set
 to the parent of the created object. Graphical objects without a parent will not appear
 on the scene, but if you do not wish to parent the item at this point you can safely pass
diff --git a/doc/src/declarative/integrating.qdoc b/doc/src/declarative/integrating.qdoc
index 83380a1..c6f754b 100644
--- a/doc/src/declarative/integrating.qdoc
+++ b/doc/src/declarative/integrating.qdoc
@@ -110,7 +110,7 @@ of QML UIs:
 \section2 Loading QGraphicsWidget objects in QML
 
 An alternative approach is to expose your existing QGraphicsWidget objects to 
-QML and construct your scene in QML instead. See the \l {declarative/cppextensions/qgraphicslayouts}{graphics layouts example}
+QML and construct your scene in QML instead. See the \l {declarative-cppextensions-qgraphicslayouts.html}{graphics layouts example}
 which shows how to expose Qt's graphics layout classes to QML in order
 to use QGraphicsWidget with classes like QGraphicsLinearLayout and QGraphicsGridLayout.
 
diff --git a/doc/src/declarative/pics/trivialListView.png b/doc/src/declarative/pics/listview-highlight.png
index dc5c6b3..dc5c6b3 100644
--- a/doc/src/declarative/pics/trivialListView.png
+++ b/doc/src/declarative/pics/listview-highlight.png
diff --git a/doc/src/declarative/pics/listview-simple.png b/doc/src/declarative/pics/listview-simple.png
new file mode 100644
index 0000000..71a1c51
--- /dev/null
+++ b/doc/src/declarative/pics/listview-simple.png
diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc
index 788d417..109d390 100644
--- a/doc/src/declarative/qdeclarativemodels.qdoc
+++ b/doc/src/declarative/qdeclarativemodels.qdoc
@@ -99,7 +99,8 @@ There are a number of QML elements that operate using data models:
 \endlist
 
 QML supports several types of data model, which may be provided by QML
-or C++ (via QDeclarativeContext::setContextProperty(), for example).
+or C++ (via QDeclarativeContext::setContextProperty() or as plugin types,
+for example).
 
 \section1 QML Data Models
 
@@ -210,8 +211,13 @@ will be positioned by the view.
 
 \section1 C++ Data Models
 
+Models defined in C++ can be made available to QML either from a C++ application or from a
+\l{QDeclarativeExtensionPlugin}{QML C++ plugin}.
+
 \section2 QAbstractItemModel
 
+A model can be defined by subclassing QAbstractItemModel.
+
 QAbstractItemModel provides the roles set via the QAbstractItemModel::setRoleNames() method.
 The default role names set by Qt are:
 
@@ -227,7 +233,18 @@ The default role names set by Qt are:
 \o decoration
 \endtable
 
-QAbstractItemModel presents a heirachy of tables.  Views currently provided by QML
+The model could be made available to QML either directly:
+
+\code
+QDeclarativeContext *ctxt = view.rootContext();
+MyModel *model = new MyModel; // subclass of QAbstractItemModel
+ctxt->setContextProperty("myModel", model);
+\endcode
+
+or by registering the subclass as a new QML type in 
+a \l{QDeclarativeExtensionPlugin}{QML C++ plugin}.
+
+QAbstractItemModel presents a heirachy of tables, but views currently provided by QML
 can only display list data.  
 In order to display child lists of a heirachical model
 the VisualDataModel element provides several properties and functions for use
@@ -242,7 +259,7 @@ with models of type QAbstractItemModel:
 
 \section2 QStringList
 
-QStringList provides the contents of the list via the \e modelData role:
+A model may be a simple QStringList, which provides the contents of the list via the \e modelData role:
 
 \table
 \row
diff --git a/doc/src/declarative/qmlruntime.qdoc b/doc/src/declarative/qmlruntime.qdoc
index b105df4..cef5e63 100644
--- a/doc/src/declarative/qmlruntime.qdoc
+++ b/doc/src/declarative/qmlruntime.qdoc
@@ -42,17 +42,17 @@
 /*!
     \page qmlruntime.html
     \title Qt Declarative UI Runtime
-    \keyword qml runtime
+    \keyword QML Viewer
     \ingroup qttools
 
     This page documents the \e{Declarative UI Runtime} for the Qt GUI
-    toolkit, and the \QQL which can be used to run apps
-    written for the runtime. The \QQL reads a declarative
+    toolkit, and the \QQV which can be used to run apps
+    written for the runtime. The \QQV reads a declarative
     user interface definition (\c .qml) file and displays the user interface it describes.
 
     QML is a runtime, as you can run plain QML files which pull in their required modules.
     To run apps with the QML runtime, you can either start the runtime
-    from your own application (using a QDeclarativeView) or with the simple \QQL.
+    from your own application (using a QDeclarativeView) or with the simple \QQV.
     The launcher can be installed in a production environment, assuming that it is not already
     present in the system. It is generally packaged alongside Qt.
 
@@ -61,16 +61,16 @@
     \list
     \o Write your own Qt application including a QDeclarative view and deploy it the same as
     any other Qt application (not discussed further on this page), or
-    \o Write a main QML file for your application, and run your application using the included \QQL.
+    \o Write a main QML file for your application, and run your application using the included \QQV.
     \endlist
 
-    To run an application with the \QQL, pass the filename as an argument:
+    To run an application with the \QQV, pass the filename as an argument:
 
     \code
-    qml myQmlFile.qml
+    qmlviewer myQmlFile.qml
     \endcode
 
-    Deploying a QML application via the \QQL allows for QML only deployments, but can also
+    Deploying a QML application via the \QQV allows for QML only deployments, but can also
     include custom C++ modules just as easily. Below is an example of how you might structure
     a complex application deployed via the QML runtime, it is a listing of the files that would
     be included in the deployment package.
@@ -92,8 +92,8 @@
     as the appropriate module file is chosen based on platform naming conventions. The C++ 
     modules must contain a QDeclarativeExtentionPlugin subclass.
 
-    The application would be executed either with your own application, the command 'qml MyApp.qml' or by 
-    opening the  file if your system has the \QQL registered as the handler for QML files. The MyApp.qml file would have access
+    The application would be executed either with your own application, the command 'qmlviewer MyApp.qml' or by
+    opening the file if your system has the \QQV registered as the handler for QML files. The MyApp.qml file would have access
     to all of the deployed types using the import statements such as the following:
 
     \code
@@ -101,15 +101,15 @@
     import "OtherModule" 1.0 as Other
     \endcode
 
-    \section1 Qt QML Launcher functionality
-    The \QQL implements some additional functionality to help it supporting
+    \section1 Qt QML Viewer functionality
+    The \QQV implements some additional functionality to help it supporting
     myriad applications. If you implement your own application, you may also wish to reimplement
     some or all of this functionality. However, much of this functionality is intended to aid the prototyping of
     QML applications and may not be necessary for a deployed application.
 
     \section2 Options
 
-    When run with the \c -help option, \c qml shows available options.
+    When run with the \c -help option, \c qmlviewer shows available options.
 
     \section2 Translations