summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-10-13 03:01:34 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-10-13 03:01:34 +0200
commitc345d1ddf66fa73660a299826b9e3a3328519bed (patch)
tree550f3a16177baa9d8481f1b8a17faff32b6550da
parent352be75dec15cb333f58d0075d89b2ebc7a2e46b (diff)
parentd76117604a9e04a9a66c0279687cc7dc54b9dc68 (diff)
downloadqtquickcontrols-c345d1ddf66fa73660a299826b9e3a3328519bed.tar.gz
Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3
Change-Id: I7986808ea6b61f4d500e678968e1ce706518636f
-rw-r--r--src/controls/doc/src/qtquickcontrols-tableview.qdoc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/controls/doc/src/qtquickcontrols-tableview.qdoc b/src/controls/doc/src/qtquickcontrols-tableview.qdoc
index 9d43c6a6..99b1202e 100644
--- a/src/controls/doc/src/qtquickcontrols-tableview.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-tableview.qdoc
@@ -263,6 +263,7 @@
\li styleData.column - the index of the view column
\li styleData.elideMode - the elide mode of the column
\li styleData.textAlignment - the horizontal text alignment of the column
+ \li styleData.role - the role of the view column
\li styleData.pressed - true when the item is pressed (since QtQuick.Controls 1.3)
\li styleData.hasActiveFocus - true when the row has focus (since QtQuick.Controls 1.3)
\endlist