diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:37:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-17 11:37:03 +0100 |
| commit | 9ef983d05df921d47cc0827670a8e3481bcc84ef (patch) | |
| tree | 0e38f79c465401c197554ba325101711a3e6c670 /src/controls/TableViewColumn.qml | |
| parent | 04ab2428e004f01f630eb5117255bb85f5390fb4 (diff) | |
| parent | a20948b726c1e0edd70761e8e115a53ba5526a51 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/controls/TableViewColumn.qml')
| -rw-r--r-- | src/controls/TableViewColumn.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/TableViewColumn.qml b/src/controls/TableViewColumn.qml index 30551f90d..a5ba2e755 100644 --- a/src/controls/TableViewColumn.qml +++ b/src/controls/TableViewColumn.qml @@ -90,7 +90,7 @@ QtObject { \li Text.ElideMiddle \li Text.ElideRight - the default \endlist - \sa {QtQuick2::}{Text::elide} */ + \sa {QtQuick::}{Text::elide} */ property int elideMode: Text.ElideRight /*! \qmlproperty enumeration TableViewColumn::horizontalAlignment @@ -102,7 +102,7 @@ QtObject { \li Text.AlignHCenter \li Text.AlignJustify \endlist - \sa {QtQuick2::}{Text::horizontalAlignment} */ + \sa {QtQuick::}{Text::horizontalAlignment} */ property int horizontalAlignment: Text.AlignLeft /*! The delegate of the column. This can be used to set the |