Merge branch 'master' into wip/ci-ios

Change-Id: Ifef75a0227267a161b821f40f0fde149823120ab

1 files changed, 34 insertions, 0 deletions

diff --git a/doc/reference/items/convenience/autotestrunner.qdoc b/doc/reference/items/convenience/autotestrunner.qdoc
index e8690ffe2..616d6459f 100644
--- a/doc/reference/items/convenience/autotestrunner.qdoc
+++ b/doc/reference/items/convenience/autotestrunner.qdoc
@@ -69,6 +69,27 @@
             \endcode
     \endlist
 
+
+    \section2 Setting Properties for individual Tests
+    \target autotestrunner-autotest-module
+
+    To control the behavior of individual tests, some properties of the \c AutotestRunner
+    can be overridden by depending on the \l autotest module and setting its properties:
+
+    \code
+    CppApplication {
+        name: "tst_mytest"
+        type: ["application", "autotest"]
+
+        Depends { name: "autotest" }
+
+        autotest.timeout: 60
+
+        // ...
+    }
+    \endcode
+
+
     \section2 Relevant Job Pools
     \target autotestrunner-job-pools
 
@@ -147,3 +168,16 @@
 
     \defaultvalue empty
 */
+
+/*!
+    \qmlproperty int AutotestRunner::timeout
+
+    Time limit for the execution of the individual tests. If a test does not finish within
+    the time limit, the test is cancelled and considered failed. A value below or equal to 0
+    means no timeout.
+    A test can override this by setting the \l{autotest::timeout}{timeout} property
+    of the \l autotest module.
+
+    \defaultvalue -1
+    \since Qbs 1.15
+*/