diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-14 03:00:57 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-14 03:00:57 +0100 |
| commit | 9c11898abfa1150cd78feeba37f55f650170c046 (patch) | |
| tree | 2e220198e4bb8ad1e9e44129793ef5fb45451ed9 | |
| parent | 3a29910271ef9ff3903b1b20c1036580897ce73c (diff) | |
| parent | d06862edd72ab1d9127a533de0f32499f831fb02 (diff) | |
| download | qtquickcontrols-9c11898abfa1150cd78feeba37f55f650170c046.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I9397a8bf036dd2d40b39e63a9fff293335be059d
| -rw-r--r-- | src/controls/Private/BasicTableView.qml | 3 | ||||
| -rw-r--r-- | src/controls/doc/src/qtquickcontrols-treeview.qdoc | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml index 48e6eadc..1a4c8416 100644 --- a/src/controls/Private/BasicTableView.qml +++ b/src/controls/Private/BasicTableView.qml @@ -57,7 +57,6 @@ import QtQuick.Window 2.2 /*! \qmltype BasicTableView - \internal \qmlabstract \inqmlmodule QtQuick.Controls.Private */ @@ -98,7 +97,6 @@ ScrollView { property Component itemDelegate: __style ? __style.itemDelegate : null /*! \qmlproperty Component BasicTableView::rowDelegate - \keyword basictableview-rowdelegate This property defines a delegate to draw a row. @@ -121,7 +119,6 @@ ScrollView { property Component rowDelegate: __style ? __style.rowDelegate : null /*! \qmlproperty Component BasicTableView::headerDelegate - \keyword basictableview-headerdelegate This property defines a delegate to draw a header. diff --git a/src/controls/doc/src/qtquickcontrols-treeview.qdoc b/src/controls/doc/src/qtquickcontrols-treeview.qdoc index 6542a939..cea447d9 100644 --- a/src/controls/doc/src/qtquickcontrols-treeview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-treeview.qdoc @@ -65,7 +65,7 @@ then be shown in their corresponding column. You can customize the look by overriding the \l [QML]{TreeView::}{itemDelegate}, - \l {basictableview-rowdelegate}{rowDelegate}, or \l {basictableview-headerdelegate}{headerDelegate} properties. + rowDelegate, or headerDelegate properties. The view itself does not provide sorting. This has to be done on the model itself. However you can provide sorting |