diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:41:43 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:41:43 +0100 |
| commit | cc0eb9c2aa9032c6a7bf2ab05d1eb913a09fa4f1 (patch) | |
| tree | 7314014389e227bd7c9b28d97eebcd072e4852a2 /src/quick/doc/src/qmltypereference.qdoc | |
| parent | cb2ac154273a8c07a1e4a14246ae22f6e0deaeda (diff) | |
| parent | 0a74dc69b4c57a15da90be29b598371dfa63f7ee (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/qml/jsruntime/qv4managed_p.h
Change-Id: I5da7ae9c87a539e42292f272d9e2b5faab619c9f
Diffstat (limited to 'src/quick/doc/src/qmltypereference.qdoc')
| -rw-r--r-- | src/quick/doc/src/qmltypereference.qdoc | 15 |
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 |