Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: Ifec879473540b609403ac951967f6d9ecb0bb6f0

1 files changed, 15 insertions, 6 deletions

diff --git a/src/qmltest/doc/src/qtquicktest-index.qdoc b/src/qmltest/doc/src/qtquicktest-index.qdoc
index 4c0124689b..a7a840f2b3 100644
--- a/src/qmltest/doc/src/qtquicktest-index.qdoc
+++ b/src/qmltest/doc/src/qtquicktest-index.qdoc
@@ -149,11 +149,13 @@
         \header
             \li Name
             \li Purpose
+            \li Since
         \row
             \li \c {void applicationAvailable()}
             \li Called right after the QApplication object was instantiated.
-                Use this function to setup everything that is not related
-                to QML directly.
+                Use this function to perform setup that does not require a
+                \l QQmlEngine instance.
+            \li Qt 5.12
         \row
             \li \c {void qmlEngineAvailable(QQmlEngine *)}
             \li Called when the QML engine is available.
@@ -161,16 +163,23 @@
                 \l {QQmlEngine::addPluginPath}{plugin paths},
                 and \l {QQmlFileSelector::setExtraSelectors}{extra file selectors}
                 will have been set on the engine by this point.
+
+                This function is called once for each QML test file,
+                so any arguments are unique to that test. For example, this
+                means that each QML test file will have its own QML engine.
+
+                This function can be used to \l {Choosing the Correct Integration
+                Method Between C++ and QML}{register QML types} and
+                \l {QQmlEngine::addImportPath()}{add import paths},
+                amongst other things.
+            \li Qt 5.11
         \row
             \li \c {void cleanupTestCase()}
             \li Called right after the test execution has finished.
                 Use this function to clean up before everything will start to be destructed.
+            \li Qt 5.12
     \endtable
 
-    Each function will be called once for each \c {tst_*.qml} file, so any
-    arguments are unique to that test. For example, this means that each QML
-    test file will have its own QML engine.
-
     The following example demonstrates how the macro can be used to set context
     properties on the QML engine: