diff options
| author | Tomasz Olszak <olszak.tomasz@gmail.com> | 2014-05-23 09:44:29 +0200 |
|---|---|---|
| committer | Tomasz Olszak <olszak.tomasz@gmail.com> | 2014-05-23 09:44:39 +0200 |
| commit | f7c8017bbd2454203bca9d3245e1f43c5742855a (patch) | |
| tree | 4c84dcc1f668387160abdb393dc0f1d517e6b02f /src/controls/TableView.qml | |
| parent | 12bb3c5541e9714eb09f538a0c791295659e9162 (diff) | |
| parent | 82a0a8244a2edf27c196f6c8cc3e2c36a3f4a8c5 (diff) | |
| download | qtquickcontrols-upstream/5.3.0.tar.gz qtquickcontrols-upstream/5.3.0.tar.bz2 qtquickcontrols-upstream/5.3.0.zip | |
Merge remote-tracking branch 'origin/stable' into wip/tizenupstream/5.3.0
Change-Id: I9292bb9319c5a5cad8904a63803464fcad1aa07f
Diffstat (limited to 'src/controls/TableView.qml')
| -rw-r--r-- | src/controls/TableView.qml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml index 75e1b4e1..c04ba971 100644 --- a/src/controls/TableView.qml +++ b/src/controls/TableView.qml @@ -708,7 +708,7 @@ ScrollView { property int rowHeight: rowSizeItem.implicitHeight property int paddedRowCount: height/rowHeight - y: listView.contentHeight + y: listView.contentHeight - listView.contentY + listView.originY width: parent.width visible: alternatingRowColors height: viewport.height - listView.contentHeight @@ -918,8 +918,6 @@ ScrollView { } } - Text{ id:text } - Item { id: tableHeader clip: true |