diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-25 09:53:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 12:15:55 +0200 |
| commit | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch) | |
| tree | 18e22092c2764fea16442fd814f230d4fe095a49 /examples/qml/doc | |
| parent | c21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff) | |
| parent | 9999591e69a0908cd3fbe14646fb98881e32061b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/quick/handlers/qquickhandlerpoint.cpp
src/quick/handlers/qquicksinglepointhandler.cpp
tests/auto/qml/ecmascripttests/test262
Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
Diffstat (limited to 'examples/qml/doc')
| -rw-r--r-- | examples/qml/doc/src/qml-extending.qdoc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/examples/qml/doc/src/qml-extending.qdoc b/examples/qml/doc/src/qml-extending.qdoc index 30c074d765..e56dd90dd7 100644 --- a/examples/qml/doc/src/qml-extending.qdoc +++ b/examples/qml/doc/src/qml-extending.qdoc @@ -28,7 +28,7 @@ /*! \example referenceexamples/adding \title Extending QML - Adding Types Example -\brief Exporting C++ Classes +\brief Exporting C++ Classes. \ingroup qmlextendingexamples The Adding Types Example shows how to add a new object type, \c Person, to QML. @@ -65,7 +65,7 @@ loads and runs the QML snippet shown at the beginning of this page. /*! \example referenceexamples/extended \title Extending QML - Extension Objects Example -\brief Extension Objects +\brief Extension Objects. \ingroup qmlextendingexamples This example builds on: @@ -96,7 +96,7 @@ not be accessible to the QML engine. /*! \example referenceexamples/properties \title Extending QML - Object and List Property Types Example -\brief Exporting C++ Properties +\brief Exporting C++ Properties. \ingroup qmlextendingexamples This example builds on: @@ -146,7 +146,7 @@ loads and runs the QML snippet shown at the beginning of this page. /*! \example referenceexamples/coercion \title Extending QML - Inheritance and Coercion Example -\brief C++ Inheritance and Coercion +\brief C++ Inheritance and Coercion. \ingroup qmlextendingexamples This example builds on: @@ -211,7 +211,7 @@ loads and runs the QML snippet shown at the beginning of this page. /*! \example referenceexamples/default \title Extending QML - Default Property Example -\brief Default Property +\brief Default Property. \ingroup qmlextendingexamples This example builds on: @@ -249,7 +249,7 @@ loads and runs the QML snippet shown at the beginning of this page. /*! \example referenceexamples/grouped \title Extending QML - Grouped Properties Example -\brief Grouped Properties +\brief Grouped Properties. \ingroup qmlextendingexamples This example builds on: @@ -265,7 +265,7 @@ This example builds on: /*! \example referenceexamples/attached \title Extending QML - Attached Properties Example -\brief Attached Properties +\brief Attached Properties. \ingroup qmlextendingexamples This example builds on: @@ -282,7 +282,7 @@ This example builds on: /*! \example referenceexamples/signal \title Extending QML - Signal Support Example -\brief Signal Support +\brief Signal Support. \ingroup qmlextendingexamples This example builds on: @@ -300,7 +300,7 @@ This example builds on: /*! \example referenceexamples/methods \title Extending QML - Methods Example -\brief Methods Support +\brief Methods Support. \ingroup qmlextendingexamples This example builds on: @@ -324,7 +324,7 @@ In \c example.qml, the \c invite() method is called in the \l [QML]{QtQml::Compo /*! \example referenceexamples/valuesource \title Extending QML - Property Value Source Example -\brief Property Value Source +\brief Property Value Source. \ingroup qmlextendingexamples This example builds on: @@ -343,7 +343,7 @@ This example builds on: /*! \example referenceexamples/binding \title Extending QML - Binding Example -\brief Binding +\brief Binding. \ingroup qmlextendingexamples This example builds on: |