diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-25 10:16:26 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-06-25 10:16:26 +0000 |
| commit | 8597f74e520c18e0ac1c7a90e02a3b5ba33d4753 (patch) | |
| tree | 8ec478d8726deddb0b9891dbeecc92850c5e6999 /src/qml/qml/qqmlcomponent.cpp | |
| parent | 0b0ff6e8cdb5d59983ae44a1d475eee11dd531c4 (diff) | |
| parent | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 9986d3577a..9b43ea0531 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -89,7 +89,7 @@ V4_DEFINE_EXTENSION(QQmlComponentExtension, componentExtension); \since 5.0 \inmodule QtQml - \brief The QQmlComponent class encapsulates a QML component definition + \brief The QQmlComponent class encapsulates a QML component definition. Components are reusable, encapsulated QML types with well-defined interfaces. @@ -183,7 +183,7 @@ V4_DEFINE_EXTENSION(QQmlComponentExtension, componentExtension); \instantiates QQmlComponent \ingroup qml-utility-elements \inqmlmodule QtQml - \brief Encapsulates a QML component definition + \brief Encapsulates a QML component definition. Components are reusable, encapsulated QML types with well-defined interfaces. |