diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:10 +0200 |
| commit | 79349119c66c2237d70fe4c13ebb9fe273ce2f85 (patch) | |
| tree | 4cfa3561f188a3904496cef330c79c1a687436ed /src/qml/doc/src/cppintegration | |
| parent | bf3b596066af733c04b5ed3ef2dc9ec753a41e79 (diff) | |
| parent | 4f0988c3907406087dbfdc193abfbf767678d814 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I326616356ee26d4532c6d57558c43c919f0a900d
Diffstat (limited to 'src/qml/doc/src/cppintegration')
| -rw-r--r-- | src/qml/doc/src/cppintegration/exposecppattributes.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/cppintegration/extending-tutorial.qdoc | 2 |
2 files changed, 2 insertions, 2 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. diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc index c0cfc3e1aa..58cc650e01 100644 --- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc +++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc @@ -389,7 +389,7 @@ directory. When building this example on Windows or Linux, the \c Charts directory will be located at the same level as the application that uses our new import module. This way, the QML engine will find our module as the default search path for QML -imports includes the directory of the application executable. On OS X, the +imports includes the directory of the application executable. On \macos, the plugin binary is copied to \c Contents/PlugIns in the the application bundle; this path is set in \l {tutorials/extending-qml/chapter6-plugins/app.pro} {chapter6-plugins/app.pro}: |