diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-23 01:00:08 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-03-25 10:13:23 +0100 |
commit | a1e38651ce245edcd8628bc8e2aad7e83184066e (patch) | |
tree | 27d3a68ac4204975faa6d0d427970fb1013e0ed4 /src/qmltest/doc/src/qtquicktest-index.qdoc | |
parent | 3980ccf785462dc7b2cb53f72790638eb9e7b8c0 (diff) | |
parent | 42ed40cf0abd0155d6e6d1ef01faf9bded065588 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
src/qmltest/quicktest.cpp
tests/auto/qml/qmlcachegen/qmlcachegen.pro
Change-Id: I70e96e8817d59647f876b8b77b30cdeede8f0662
Diffstat (limited to 'src/qmltest/doc/src/qtquicktest-index.qdoc')
-rw-r--r-- | src/qmltest/doc/src/qtquicktest-index.qdoc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/qmltest/doc/src/qtquicktest-index.qdoc b/src/qmltest/doc/src/qtquicktest-index.qdoc index 4c0124689b..668d6c1417 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,10 +163,17 @@ \l {QQmlEngine::addPluginPath}{plugin paths}, and \l {QQmlFileSelector::setExtraSelectors}{extra file selectors} will have been set on the engine by this point. + + 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 |