summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-11 03:01:20 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-11 03:01:20 +0100
commitd06862edd72ab1d9127a533de0f32499f831fb02 (patch)
tree083f0fb381c3a07718fe0b61f5c8201d6f2c246b
parent1757766e9812337c0bddffd267baf04c332efd47 (diff)
parent035cbc87fa7892f58e1e1908a8f98bd9c579c8a0 (diff)
downloadqtquickcontrols-d06862edd72ab1d9127a533de0f32499f831fb02.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ia4ce71363671afd3f3a6ae8ff4740388c007f7f3
-rw-r--r--src/controls/Private/BasicTableView.qml3
-rw-r--r--src/controls/doc/src/qtquickcontrols-treeview.qdoc2
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