From 878381473c03adda47736e37e7499fa7566e6bd3 Mon Sep 17 00:00:00 2001 From: Artem Dyomin Date: Fri, 2 May 2025 20:26:55 +0200 Subject: [PATCH] QGIM: fix columnCount for tree model If static_column_count is 0 (one_dimensional_range) columnCount should return 1. Change-Id: I96a1f83d3d5880e16b6553c515a619ff93f7d2a3 Reviewed-by: Volker Hilsheimer --- src/corelib/itemmodels/qgenericitemmodel.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/itemmodels/qgenericitemmodel.h b/src/corelib/itemmodels/qgenericitemmodel.h index cd4bae6342a..9cce06cba64 100644 --- a/src/corelib/itemmodels/qgenericitemmodel.h +++ b/src/corelib/itemmodels/qgenericitemmodel.h @@ -1301,7 +1301,10 @@ protected: int columnCount(const QModelIndex &) const { // all levels of a tree have to have the same, static, column count - return Base::static_column_count; + if constexpr (Base::one_dimensional_range) + return 1; + else + return Base::static_column_count; // if static_column_count is -1, static assert fires } static constexpr Qt::ItemFlags defaultFlags()