diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-27 12:27:54 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-27 12:27:54 +0200 |
commit | 9d085bf0024c442b14b7d22bc629574058176deb (patch) | |
tree | 98dc9c7703454906e66f022688bbc9a01f10ea5f /src/qml/doc/src/cppintegration/data.qdoc | |
parent | 621c5b2b260d63fef7190c133f7384b8ccb93307 (diff) | |
parent | 6b58ce5251045fb751eb511b2cb3571bcd113f28 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-beta1
Conflicts:
tests/auto/quick/qquicktextedit/BLACKLIST
Change-Id: I0b9e5bea5da5d2666887c202e62d889b4aa56900
Diffstat (limited to 'src/qml/doc/src/cppintegration/data.qdoc')
-rw-r--r-- | src/qml/doc/src/cppintegration/data.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc index cc2fe90483..ac6600f38c 100644 --- a/src/qml/doc/src/cppintegration/data.qdoc +++ b/src/qml/doc/src/cppintegration/data.qdoc @@ -52,8 +52,8 @@ remain with C++ by invoking QQmlEngine::setObjectOwnership() with QQmlEngine::CppOwnership specified. Additionally, the QML engine respects the normal QObject parent ownership -semantics of Qt C++ objects, and will not ever take ownership of a QObject -instance which already has a parent. +semantics of Qt C++ objects, and will never delete a QObject instance which +has a parent. \section1 Basic Qt Data Types |