diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-15 01:00:05 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-15 09:36:12 +0200 |
| commit | 8bc3329e2cec4638fa9af274a40dda176bbb7352 (patch) | |
| tree | 87ebd27e0f6dc305c78fddb956e65bd5922a078b /src/qmltest/doc/src/qtquicktest-index.qdoc | |
| parent | 75998b22b0b216d925e93d2c0e205025c23b2522 (diff) | |
| parent | 6dac2e7df7fbf0f29667bf92b4e72426db47dbe9 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3
Conflicts:
src/3rdparty/masm/assembler/LinkBuffer.h
src/qmltest/doc/src/qtquicktest-index.qdoc
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
Change-Id: I7d83ad95cf489dda794dd7a0a33bad3ef3b05609
Diffstat (limited to 'src/qmltest/doc/src/qtquicktest-index.qdoc')
| -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: |