diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:02:22 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:02:22 +0200 |
| commit | bfb7d1a9b026d3735930b31d79d936d5a3d4c79d (patch) | |
| tree | d70fdb16dcb9525c28e0e2c5927c5372b2cc64b3 /src/controls/doc | |
| parent | f2c24adbb3e9561bb2f49f9dfa4daf5d5f315f6a (diff) | |
| parent | 3b71eea2e6e712103452c98756cd6ce53aa4ebca (diff) | |
| download | qtquickcontrols-bfb7d1a9b026d3735930b31d79d936d5a3d4c79d.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia4e23f05ee0dc32d13ad809f4021cd5f0cdff701
Diffstat (limited to 'src/controls/doc')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc index 08f61e10..fff6103e 100644 --- a/src/controls/doc/src/qtquickcontrols-examples.qdoc +++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc @@ -208,7 +208,7 @@ \example touch \title Qt Quick Controls - Touch Gallery \ingroup qtquickcontrols_examples - \brief Demonstrates UI controls for a touch interface + \brief Demonstrates UI controls for a touch interface. \image qtquickcontrols-example-touch.png \e {Touch Gallery} demonstrates how to implement a UI suitable for touch @@ -454,7 +454,7 @@ \example calendar \title Qt Quick Controls - Calendar Example \ingroup qtquickcontrols_examples - \brief Demonstrates the use of Calendar control + \brief Demonstrates the use of Calendar control. \image qtquickcontrols-example-calendar.png The Calendar example displays a Calendar control and an events list for @@ -542,7 +542,7 @@ \example styles \title Qt Quick Controls - Styles Example \ingroup qtquickcontrols_examples - \brief Demonstrates custom styles + \brief Demonstrates custom styles. \image qtquickcontrols-example-styles.png This example shows how to create custom styles for \l{Qt Quick Controls}. diff --git a/src/controls/doc/src/qtquickcontrolsstyles-tableviewstyle.qdoc b/src/controls/doc/src/qtquickcontrolsstyles-tableviewstyle.qdoc index efb4094d..51f7ca8b 100644 --- a/src/controls/doc/src/qtquickcontrolsstyles-tableviewstyle.qdoc +++ b/src/controls/doc/src/qtquickcontrolsstyles-tableviewstyle.qdoc @@ -32,7 +32,7 @@ \since 5.1 \ingroup viewsstyling \ingroup controlsstyling - \brief Provides custom styling for TableView + \brief Provides custom styling for TableView. */ /*! diff --git a/src/controls/doc/src/qtquickcontrolsstyles-treeviewstyle.qdoc b/src/controls/doc/src/qtquickcontrolsstyles-treeviewstyle.qdoc index 4e135f26..224621aa 100644 --- a/src/controls/doc/src/qtquickcontrolsstyles-treeviewstyle.qdoc +++ b/src/controls/doc/src/qtquickcontrolsstyles-treeviewstyle.qdoc @@ -32,7 +32,7 @@ \since 5.5 \ingroup viewsstyling \ingroup controlsstyling - \brief Provides custom styling for TreeView + \brief Provides custom styling for TreeView. */ /*! |