diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:25:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:25:02 +0200 |
| commit | dc1d95819365202e2745faffe31e13d928742c4c (patch) | |
| tree | ee45832495cc20d26143fc3ec4f74c3212b0742e /src/controls/doc/src/qtquickcontrols-tableview.qdoc | |
| parent | 52672d6811eeda364c10fa4d81c2b352e8b1d2e8 (diff) | |
| parent | 22fab1502f562bccb3c16dde0288aa867e3b094a (diff) | |
| download | qtquickcontrols-dc1d95819365202e2745faffe31e13d928742c4c.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: Iab80dd0c2bea54171971fd7a9538000908ed90d5
Diffstat (limited to 'src/controls/doc/src/qtquickcontrols-tableview.qdoc')
| -rw-r--r-- | src/controls/doc/src/qtquickcontrols-tableview.qdoc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/controls/doc/src/qtquickcontrols-tableview.qdoc b/src/controls/doc/src/qtquickcontrols-tableview.qdoc index e2dd5026..cf86174a 100644 --- a/src/controls/doc/src/qtquickcontrols-tableview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-tableview.qdoc @@ -32,7 +32,6 @@ \since 5.1 \ingroup views \ingroup controls - \inherits QtQuickControls1::BasicTableView \brief Provides a list view with scroll bars, styling and header sections. \image tableview.png @@ -289,12 +288,12 @@ */ /*! - \qmlpropertygroup TableView::section + \qmlpropertygroup QtQuick.Controls::TableView::section \qmlproperty string TableView::section.property \qmlproperty enumeration TableView::section.criteria \qmlproperty Component TableView::section.delegate \qmlproperty enumeration TableView::section.labelPositioning These properties determine the section labels. - \sa ListView::section + \sa {QtQuick::ListView::section}{ListView.section} */ |