summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2020-01-15 19:09:35 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2020-01-15 19:09:35 +0200
commitc8a2a74b2839d9d6c5f8f6f9034470dafc8bcc40 (patch)
tree8f5598dc83868c7446ad3300512f2358fa9b6696
parent9603570d42f3ae28ac2063a19b757531c7d2941e (diff)
parent035cbc87fa7892f58e1e1908a8f98bd9c579c8a0 (diff)
downloadqtquickcontrols-5.14.1.tar.gz
Merge 5.14 into 5.14.1v5.14.15.14.1
Change-Id: I91a981474478b244f956497347155d5c44e4fc84
-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