diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-19 16:32:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-19 16:32:09 +0200 |
| commit | 4f0988c3907406087dbfdc193abfbf767678d814 (patch) | |
| tree | aafd9c98bb248d9920443778bf122ea23b1e4c75 /src/qml/doc/src/cppintegration | |
| parent | 32a980a86257021247a742b2b8c0b4aafe6e9035 (diff) | |
| parent | 01a9c006b0cb3f9ec7c140d25e6bfa3ca6250a4c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I7bd70996e3372d154c6b0e47336baa22146667b0
Diffstat (limited to 'src/qml/doc/src/cppintegration')
| -rw-r--r-- | src/qml/doc/src/cppintegration/exposecppattributes.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc index c7e4930bfb..f5aea0b01a 100644 --- a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc +++ b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc @@ -73,7 +73,7 @@ convert them as appropriately when used from QML. Additionally, C++ classes that are \l{Registering C++ types with the QML type system}{registered} with the QML type system can be can be used as data types, as can their enums if appropriately registered. See \l{qtqml-cppintegration-data.html}{Data Type -Conversion Between QML and C++} for details for further information. +Conversion Between QML and C++} for further information. Additionally, data ownership rules are taken into consideration when data is transferred from C++ to QML. See \l {Data Ownership} for more details. |