diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-07 10:56:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 13:03:25 +0200 |
| commit | 68ba8fe3ccf7abe8d24ba3614f8d7ceb3778de74 (patch) | |
| tree | 8fdc2922aa5375203fef05746691e88632a92bbe /src/qml/doc/src/qmlfunctions.qdoc | |
| parent | 0d8de448ef746aea7215f6f654660500dc9601d2 (diff) | |
| parent | a676e4e2dae945c02521691c7018f5a5534feff9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
This change also fixes the build of two benchmarks, tst_affectors
and tst_emission.
Conflicts:
src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
src/qml/qml/ftw/qhashfield_p.h
tests/benchmarks/particles/affectors/tst_affectors.cpp
tests/benchmarks/particles/emission/tst_emission.cpp
tests/benchmarks/qml/pointers/pointers.pro
tests/benchmarks/qml/pointers/tst_pointers.cpp
tests/benchmarks/qml/qmltime/qmltime.pro
tests/benchmarks/qml/qquickwindow/qquickwindow.pro
Change-Id: I595309d1e183c18371cb9b07af6e4681059de3b2
Diffstat (limited to 'src/qml/doc/src/qmlfunctions.qdoc')
| -rw-r--r-- | src/qml/doc/src/qmlfunctions.qdoc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc index 6f738752a7..26fc40ff37 100644 --- a/src/qml/doc/src/qmlfunctions.qdoc +++ b/src/qml/doc/src/qmlfunctions.qdoc @@ -338,9 +338,8 @@ One exception to this is that a QObject singleton type property may not be aliased (because the singleton type name does not identify an object within the same component as any other item). - \b{NOTE:} A QObject singleton type instance returned from a singleton type provider is owned by the QML - engine. For this reason, the singleton type provider function should \b{not} be implemented as a - singleton factory. + \b{NOTE:} A QObject singleton type instance returned from a singleton type provider is owned by + the QML engine unless the object has explicit QQmlEngine::CppOwnership flag set. Usage: \code |