diff options
author | Liang Qi <liang.qi@qt.io> | 2016-12-25 18:28:32 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-12-25 18:35:38 +0100 |
commit | 9a272ad1854d744ea57296ba633b9d0dc19d1625 (patch) | |
tree | 096752ec339e18998517a4598f907e4b42b9403d /examples/qml | |
parent | 70c6b9639c53d2a530ccabd1395f561211c16fa4 (diff) | |
parent | d8a052bc6b0349045db3d43a373b09cb16b41a48 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
tools/qmlimportscanner/main.cpp
Change-Id: I01e17581f6691a03f83788773364d0cf96319514
Diffstat (limited to 'examples/qml')
-rw-r--r-- | examples/qml/doc/src/qml-extending.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/qml/doc/src/qml-extending.qdoc b/examples/qml/doc/src/qml-extending.qdoc index e5b364e0bc..0812a3dba1 100644 --- a/examples/qml/doc/src/qml-extending.qdoc +++ b/examples/qml/doc/src/qml-extending.qdoc @@ -174,7 +174,7 @@ and other types can be coerced to it. \section2 Define Boy and Girl -The implementation of Boy and Girl are trivial. +The implementation of Boy and Girl is trivial. \snippet referenceexamples/coercion/person.cpp 1 |