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

Conflicts:
	tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp

Change-Id: Ic1dace832ad4b29023d24808b8617b5dcc915eb5

1 files changed, 2 insertions, 1 deletions

diff --git a/src/qmltest/doc/src/qtquicktest-index.qdoc b/src/qmltest/doc/src/qtquicktest-index.qdoc
index 15ea33d06a..48b41d4f0a 100644
--- a/src/qmltest/doc/src/qtquicktest-index.qdoc
+++ b/src/qmltest/doc/src/qtquicktest-index.qdoc
@@ -151,17 +151,18 @@
             \li Name
             \li Purpose
         \row
-        \row
             \li void applicationAvailable()
             \li Called right after the QApplication object was instantiated.
                 Use this function to setup everything that is not related
                 to QML directly.
+        \row
             \li void qmlEngineAvailable(QQmlEngine*)
             \li Called when the QML engine is available.
                 Any \l {QQmlEngine::addImportPath}{import paths},
                 \l {QQmlEngine::addPluginPath}{plugin paths},
                 and \l {QQmlFileSelector::setExtraSelectors}{extra file selectors}
                 will have been set on the engine by this point.
+        \row
             \li void cleanupTestCase()
             \li Called right after the test execution has finished.
                 Use this function to clean up before everything will start to be destructed.