diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 03:01:27 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 03:01:27 +0100 |
| commit | 854d94008c519fd7eb1c0d47796640a95287b17c (patch) | |
| tree | a59db1d75a9065ed96f1bc474d0a0bd44af4a3fe /src | |
| parent | 4342de8c20484035a5a2710752d75437a55f853d (diff) | |
| parent | 042f9a77aeff492c838326404e2f23f070c8cbd1 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I468c68a1a8a1ce3eaef88bf26ec8deed05a65d39
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/Private/BasicTableView.qml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml index 2557dca79..1f846b57e 100644 --- a/src/controls/Private/BasicTableView.qml +++ b/src/controls/Private/BasicTableView.qml @@ -260,6 +260,17 @@ ScrollView { if (index >= 0 && index <= columnCount && object.Accessible.role === Accessible.ColumnHeader) { object.__view = root columnModel.insert(index, {columnItem: object}) + if (root.__columns[index] !== object) { + // The new column needs to be put into __columns at the specified index + // so the list needs to be recreated to be correct + var arr = [] + for (var i = 0; i < index; ++i) + arr.push(root.__columns[i]) + arr.push(object) + for (i = index; i < root.__columns.length; ++i) + arr.push(root.__columns[i]) + root.__columns = arr + } return object } |