aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kdab.com>2016-03-21 12:18:47 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2016-03-24 19:39:57 +0000
commit89b96d2c6324f229dce9f10b1acba7560dff905d (patch)
treeddffad52a055404b8f7790153bb5950c6a246b87
parent5e674480d5d72bc4f8fd132b2351a59d397f67b3 (diff)
Fix qmlRegisterSingletonType documentation
Change-Id: I36d22343976a2164c396bb17c13526b63ab7579c Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
-rw-r--r--src/qml/doc/src/qmlfunctions.qdoc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc
index 4203cca8b3..6fc82eb554 100644
--- a/src/qml/doc/src/qmlfunctions.qdoc
+++ b/src/qml/doc/src/qmlfunctions.qdoc
@@ -365,9 +365,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