diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2026-01-16 13:36:01 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2026-01-23 14:20:25 +0000 |
| commit | 444d4e0a7dbd5fb695726c24100f5a4a8428e751 (patch) | |
| tree | 00e149483feb2d081f71d4a31fd7c709a2491ec5 /src/quick/items | |
| parent | 51f6090f34a6cb8179d353036bc3766556420fbb (diff) | |
QtQuick: Guard TreeView against null m_treeModelToTableModel.model()
It's null by default. We must not crash on that.
Pick-to: 6.10 6.8
Change-Id: I456e2523ed83937946d497cc218be081c3e8b3e1
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io>
(cherry picked from commit 8311f2235749622a8e884c7e921b48c1696eca88)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquicktreeview.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/quick/items/qquicktreeview.cpp b/src/quick/items/qquicktreeview.cpp index b752f411e0..098ad86f06 100644 --- a/src/quick/items/qquicktreeview.cpp +++ b/src/quick/items/qquicktreeview.cpp @@ -516,9 +516,8 @@ void QQuickTreeView::expandRecursively(int row, int depth) if (isExpanded && depth == 1) return; expandRowRecursively(row); - } else { + } else if (const auto model = d->m_treeModelToTableModel.model()) { // Expand all root nodes recursively - const auto model = d->m_treeModelToTableModel.model(); for (int r = 0; r < model->rowCount(); ++r) { const int rootRow = d->m_treeModelToTableModel.itemIndex(model->index(r, 0)); if (rootRow != -1) @@ -620,9 +619,8 @@ void QQuickTreeView::collapseRecursively(int row) if (row >= 0) { collapseRowRecursive(row); - } else { + } else if (const auto model = d->m_treeModelToTableModel.model()) { // Collapse all root nodes recursively - const auto model = d->m_treeModelToTableModel.model(); for (int r = 0; r < model->rowCount(); ++r) { const int rootRow = d->m_treeModelToTableModel.itemIndex(model->index(r, 0)); if (rootRow != -1) |