Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41

2 files changed, 28 insertions, 8 deletions

diff --git a/src/quick/doc/src/appdevguide/debugging.qdoc b/src/quick/doc/src/appdevguide/debugging.qdoc
index 86a577f069..94ce13459c 100644
--- a/src/quick/doc/src/appdevguide/debugging.qdoc
+++ b/src/quick/doc/src/appdevguide/debugging.qdoc
@@ -123,14 +123,6 @@ function f() {
 \c console.exception prints an error message together with the stack trace of JavaScript
 execution at the point where it is called.
 
-\section1 Debugging Transitions
-
-When a transition doesn't look quite right, it can be helpful to view it in slow
-motion to see what is happening more clearly. This functionality is supported
-in the \l{qtquick-qmlscene.html}{QML Scene} tool: to enable this,
-click on the "Debugging" menu, then "Slow Down Animations".
-
-
 \section1 Debugging module imports
 
 The \c QML_IMPORT_TRACE environment variable can be set to enable debug output
diff --git a/src/quick/doc/src/appdevguide/qtquicktest.qdoc b/src/quick/doc/src/appdevguide/qtquicktest.qdoc
index bf8ca86959..f6085764be 100644
--- a/src/quick/doc/src/appdevguide/qtquicktest.qdoc
+++ b/src/quick/doc/src/appdevguide/qtquicktest.qdoc
@@ -95,6 +95,20 @@
     tst_example -input /mnt/SDCard/qmltests
     \endcode
 
+    It is also possible to run a single file using the \c{-input} option.
+    For example:
+
+    \code
+    tst_example -input data/test.qml
+    \endcode
+
+    \code
+    tst_example -input <full_path>/test.qml
+    \endcode
+
+    \note Specifying the full path to the qml test file is for example
+    needed for shadow builds.
+
     If your test case needs QML imports, then you can add them as
     \c{-import} options to the test program command-line by adding
     the following line to your .pro file:
@@ -102,4 +116,18 @@
     \code
     IMPORTPATH += $$PWD/../imports/my_module1 $$PWD/../imports/my_module2
     \endcode
+
+    The \c{-functions} command-line option will return a list of the current
+    tests functions. It is possible to run a single test function using the name
+    of the test function as an argument. For example:
+
+    \code
+    tst_example Test_Name::function1
+    \endcode
+
+    The \c{-help} command-line option will return all the options available.
+
+    \code
+    tst_example -help
+    \endcode
 */