aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc/src/qmltypereference.qdoc
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-01-14 18:06:27 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-14 20:04:43 +0100
commit679ea13790f217df0bb240fb80fd4ee5208e2084 (patch)
tree06008436e14fea1c0ac367af6f0bdd79ded967be /src/quick/doc/src/qmltypereference.qdoc
parent8e17ab6dc6c51339e824f2f1a2cbdf445b482887 (diff)
parentcc0eb9c2aa9032c6a7bf2ab05d1eb913a09fa4f1 (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/doc/src/qmltypereference.qdoc')
-rw-r--r--src/quick/doc/src/qmltypereference.qdoc15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index dda06d31e1..7fc9bea032 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -42,11 +42,11 @@ by this module, organized according to category and purpose.
The types provided by the \l {Qt Quick} module are only available in a QML document
if that document imports the \c QtQuick namespace.
-The current version of the \c QtQuick module is version 2.0, and thus it may be
+The current version of the \c QtQuick module is version 2.2, and thus it may be
imported via the following statement:
\qml
-import QtQuick 2.0
+import QtQuick 2.2
\endqml
See the \l {Qt Quick} module documentation for more
@@ -310,6 +310,14 @@ set of Particle System types for Qt Quick 2
\li \l {TextMetrics} - Provides text and font measurement data for use in a Canvas
\endlist
+\target qttest-types
+\section2 QtTest Types
+
+\list
+\li \l {QtTest::TestCase}{TestCase} - Represents a unit test case
+\li \l {QtTest::SignalSpy}{SignalSpy} - Enables introspection of signal emission
+\endlist
+
*/
/*!
@@ -1070,8 +1078,9 @@ console.log(c + " " + d); // false true
/*!
\qmlmodule QtTest 1.0
-\title Qt Quick Test
+\title Qt Quick Test QML Types
\brief This module provides QML types to unit test your QML application
+\ingroup qmlmodules
You can import this module using the following statement:
\code