diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:48:27 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:48:28 +0100 |
| commit | 6c62408bc4ca6978232ba6d3c88cc5649c2c8919 (patch) | |
| tree | 40c576d8898b1830dace89f86b71ce583395de0e /src | |
| parent | eb554a20ec5c48643784ce7b29f97ccfb31e7f89 (diff) | |
| parent | b26bfb18616e2a4baf33f9f1a2c147e3f5512de6 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I3022d2eabeef6d387135427b553de8a6d80dff13
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/TreeView.qml | 8 | ||||
| -rw-r--r-- | src/controls/doc/src/qtquickcontrolsstyles-index.qdoc | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/controls/TreeView.qml b/src/controls/TreeView.qml index 6a38acff5..2bedb9e64 100644 --- a/src/controls/TreeView.qml +++ b/src/controls/TreeView.qml @@ -49,7 +49,7 @@ BasicTableView { property var model: null property alias rootIndex: modelAdaptor.rootIndex - readonly property var currentIndex: modelAdaptor.mapRowToModelIndex(__currentRow) + readonly property var currentIndex: modelAdaptor.updateCount, modelAdaptor.mapRowToModelIndex(__currentRow) property ItemSelectionModel selection: null signal activated(var index) @@ -96,6 +96,12 @@ BasicTableView { id: modelAdaptor model: root.model + // Hack to force re-evaluation of the currentIndex binding + property int updateCount: 0 + onModelReset: updateCount++ + onRowsInserted: updateCount++ + onRowsRemoved: updateCount++ + onExpanded: root.expanded(index) onCollapsed: root.collapsed(index) } diff --git a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc index 9333ee271..c86488faa 100644 --- a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc +++ b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc @@ -60,7 +60,7 @@ \title Qt Quick Controls 1 Styles \brief The Qt Quick Controls Styles submodule provides custom styles for Qt Quick Controls. - \deprecation-warning + \deprecationwarning The Qt Quick Controls Styles submodule allows custom styling for \l {Qt Quick Controls 1}. @@ -132,7 +132,7 @@ \ingroup qmlmodules \brief Provides QML types for Qt Quick Controls styles. - \deprecation-warning + \deprecationwarning The \l{Qt Quick Controls 1} module provides a set of QML types for handling styles. |