diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2014-01-08 13:55:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-09 23:33:18 +0100 |
| commit | f5c6987ef8f09873dcfc47b5d4dbd532da660b2b (patch) | |
| tree | dca1181b4860ff4504b3138e092f7a2cb6fe6476 /src/quick | |
| parent | 7701b58ad06f9e99d291e0e3468096dc3ab4dd00 (diff) | |
Doc: QtTest - Fix documentation for TestCase and SignalSpy
The property/methods documentation needs to be available in the
components qml file. Thus we now import those components from the
qml files directly instead of using fake header files.
Rename the Qt Quick Test page to Qt Quick Test Qml Types to be
consistent with the other submodules.
Task-number: QTBUG-33587
Change-Id: Ifb1df8e7d15f2e23b4b4268e5df138934e62fc42
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 3 | ||||
| -rw-r--r-- | src/quick/doc/src/qmltypereference.qdoc | 11 | ||||
| -rw-r--r-- | src/quick/doc/src/qtquick.qdoc | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 846da64ea4..5ba7d66b04 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -38,7 +38,8 @@ depends += qtcore qtxmlpatterns qtqml qtgui qtlinguist qtquickcontrols qtquickla headerdirs += .. -sourcedirs += .. +sourcedirs += .. \ + ../../imports/testlib exampledirs += ../../../examples/quick \ snippets diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index dda06d31e1..21cfd2e18b 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -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 diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc index 392ae0af92..4ecefe73dd 100644 --- a/src/quick/doc/src/qtquick.qdoc +++ b/src/quick/doc/src/qtquick.qdoc @@ -125,6 +125,7 @@ Additional Qt Quick information: top-level windows and accessing screen information \li \l{Qt Quick Dialogs}{Dialogs} - contains types for creating and interacting with system dialogs + \li \l{Qt Quick Test QML Types}{Tests} - contains types for writing unit test for a QML application \endlist \li \l{Qt Quick Release Notes} - list of changes and additions in the Qt Quick \li \l{Qt Quick Code Samples} - list of all Qt Quick examples |