diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:29:32 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:37:03 +0100 |
| commit | 4821058f10118be55a541ad39e25ec9165cca3b3 (patch) | |
| tree | 167973e3c68fc442b0e37d6f628f3fdbe759f15a /src/imports/testlib/testcase.qdoc | |
| parent | 83f11e33745180e9370d484cbcedd0bac020c9dd (diff) | |
| parent | 26d5f2e833f0e3686aaa27e695bbfab5fbd808ad (diff) | |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
Diffstat (limited to 'src/imports/testlib/testcase.qdoc')
| -rw-r--r-- | src/imports/testlib/testcase.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/testlib/testcase.qdoc b/src/imports/testlib/testcase.qdoc index d8a20e4fc7..f928cdaa44 100644 --- a/src/imports/testlib/testcase.qdoc +++ b/src/imports/testlib/testcase.qdoc @@ -180,7 +180,7 @@ and mouseMove() methods can be used to simulate mouse events in a similar fashion. - \bold{Note:} keyboard and mouse events can only be delivered once the + \b{Note:} keyboard and mouse events can only be delivered once the main window has been shown. Attempts to deliver events before then will fail. Use the \l when and windowShown properties to track when the main window has been shown. @@ -446,7 +446,7 @@ focused item. If \a delay is larger than 0, the test will wait for \a delay milliseconds. - \bold{Note:} At some point you should release the key using keyRelease(). + \b{Note:} At some point you should release the key using keyRelease(). \sa keyRelease(), keyClick() */ |