summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorJeremy Katz <jeremy.katz@nokia.com>2012-08-17 14:37:07 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-21 06:48:46 +0200
commite1d06080f891b01ab5ab1733c524ebb49e3a5f16 (patch)
tree5f87df781b1c7882b8a5254560922272c9881e55 /src/testlib
parentf8704a3e957521c3994adf742d726638a1db2ae3 (diff)
fix some QTest documentation
* Use \b instead of \bold * widnow -> window typo * QTest::touchEvent's second parameter is QTouchDevice *, not QTouchEvent::DeviceType, and autoCommit defaults to true * QSignalSpy::wait() isn't const Change-Id: I75a91c1cd98b1c582cd654b2b72ad61e5c0e31d2 Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/qsignalspy.qdoc2
-rw-r--r--src/testlib/qtestcase.cpp12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/testlib/qsignalspy.qdoc b/src/testlib/qsignalspy.qdoc
index e9e1f4d5e6..1156a2fd4d 100644
--- a/src/testlib/qsignalspy.qdoc
+++ b/src/testlib/qsignalspy.qdoc
@@ -86,7 +86,7 @@
\internal
*/
-/*! \fn QSignalSpy::wait(int timeout) const
+/*! \fn QSignalSpy::wait(int timeout)
\since 5.0
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 73acf01708..128ee7327b 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -411,7 +411,7 @@ QT_BEGIN_NAMESPACE
absolute paths to the source files are passed to the compiler. Otherwise, the
absolute path of the source directory cannot be determined.
- \bold {Note:} For tests that use the \l QTEST_APPLESS_MAIN() macro to generate a
+ \b {Note:} For tests that use the \l QTEST_APPLESS_MAIN() macro to generate a
\c{main()} function, \c{QFINDTESTDATA} will not attempt to find test data
relative to QCoreApplication::applicationDirPath(). In practice, this means that
tests using \c{QTEST_APPLESS_MAIN()} will fail to find their test data
@@ -996,7 +996,7 @@ QT_BEGIN_NAMESPACE
Adds a move event for touchpoint \a touchId at position \a pt to this sequence and returns
a reference to this QTouchEventSequence.
- The position \a pt is interpreted as relative to \a window. If \a widnow is the null pointer, then
+ The position \a pt is interpreted as relative to \a window. If \a window is the null pointer, then
\a pt is interpreted as relative to the window provided when instantiating this QTouchEventSequence.
Simulates that the user moved the finger identified by \a touchId.
@@ -1049,10 +1049,10 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \fn QTouchEventSequence QTest::touchEvent(QWindow *window, QTouchEvent::DeviceType deviceType, bool autoCommit)
+ \fn QTouchEventSequence QTest::touchEvent(QWindow *window, QTouchDevice *device, bool autoCommit = true)
\since 5.0
- Creates and returns a QTouchEventSequence for the device \a deviceType to
+ Creates and returns a QTouchEventSequence for the \a device to
simulate events for \a window.
When adding touch events to the sequence, \a window will also be used to translate
@@ -1066,9 +1066,9 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \fn QTouchEventSequence QTest::touchEvent(QWidget *widget, QTouchEvent::DeviceType deviceType, bool autoCommit)
+ \fn QTouchEventSequence QTest::touchEvent(QWidget *widget, QTouchDevice *device, bool autoCommit = true)
- Creates and returns a QTouchEventSequence for the device \a deviceType to
+ Creates and returns a QTouchEventSequence for the \a device to
simulate events for \a widget.
When adding touch events to the sequence, \a widget will also be used to translate