diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-08 18:18:04 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-08 18:18:53 +0100 |
| commit | 40722a7eaf6bb6d77d730dc3f8510718e2cad549 (patch) | |
| tree | 1c3dec7b83ebd2bef910075889dc2c39697933ea /src/imports | |
| parent | a9bef84675f6b67bb88a2bb99e45aba889795251 (diff) | |
| parent | 2f9099443d9acd6583e92785afbb38b2e4dcbfd5 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ied8d65aaf57e897a3dbc4df100744a594e8ee2cf
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/testlib/signalspy.qdoc | 2 | ||||
| -rw-r--r-- | src/imports/testlib/testcase.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/testlib/signalspy.qdoc b/src/imports/testlib/signalspy.qdoc index d6f8621c23..c20e268138 100644 --- a/src/imports/testlib/signalspy.qdoc +++ b/src/imports/testlib/signalspy.qdoc @@ -75,7 +75,7 @@ synchronously. For asynchronous signals, the wait() method can be used to block the test until the signal occurs (or a timeout expires). - \sa TestCase + \sa TestCase, {Qt Quick Test Reference Documentation} */ /*! diff --git a/src/imports/testlib/testcase.qdoc b/src/imports/testlib/testcase.qdoc index 4506209f8e..74d2c57098 100644 --- a/src/imports/testlib/testcase.qdoc +++ b/src/imports/testlib/testcase.qdoc @@ -205,7 +205,7 @@ will fail. Use the \l when and windowShown properties to track when the main window has been shown. - \sa SignalSpy + \sa SignalSpy, {Qt Quick Test Reference Documentation} */ /*! |