diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-12 20:49:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-12 20:49:45 +0200 |
| commit | b4cdfc4a12d2b9ebc79fe17a2f1aff67bd940d71 (patch) | |
| tree | e7841ee2695a3ef180e186d2df971c8fc207d0f9 /src/qml/doc/src/cppintegration | |
| parent | 650b5db06b057abe2db40fb8d56223e17ba8c06a (diff) | |
| parent | af002b8df9b084fd7f26e9eead9844aab36bdc4d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib31008e593442ca5813fb14ae6b02f7ab2577395
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 f5aea0b01a..ed0d049564 100644 --- a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc +++ b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc @@ -71,7 +71,7 @@ type that is supported by the QML engine. By default, the engine supports a number of Qt C++ types and can automatically 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 +the QML type system 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 further information. |