diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-18 01:00:17 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-18 08:01:45 +0200 |
| commit | 934f25028a232c9bccdb842f53fa67959cc8dffc (patch) | |
| tree | a78fef6197d63feab3194eb7f4cd2e10934b18ee /src/qmltest | |
| parent | f8e90c61c5da4ca5e0aec24d42b2962877289ab2 (diff) | |
| parent | 2bdbf216fe7b6cf9d404b80ac405bd3969f5c07f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/qml/qqmlimport.cpp
Change-Id: I6add6267297ea50a646d43d212027a168dca8916
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/doc/src/qtquicktest-index.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qmltest/doc/src/qtquicktest-index.qdoc b/src/qmltest/doc/src/qtquicktest-index.qdoc index 668d6c1417..a7a840f2b3 100644 --- a/src/qmltest/doc/src/qtquicktest-index.qdoc +++ b/src/qmltest/doc/src/qtquicktest-index.qdoc @@ -164,6 +164,10 @@ 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}, @@ -176,10 +180,6 @@ \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: |