diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-25 11:48:36 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-25 11:48:36 +0000 |
| commit | 5fb347c93daabfb6ab554fa6f8a08a6d02c64cc2 (patch) | |
| tree | 85d0bf56afd544ba1b93d6ee9e59494a9912a276 /src | |
| parent | d30f88cbf1f128def324532baf7018787d527410 (diff) | |
| parent | e287582cba74ddcfc67f83647e72c0b23bd99c36 (diff) | |
Merge integration refs/builds/qtci/dev/1616664803
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index 398425c0207..9fb66b023a9 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -1714,7 +1714,10 @@ void QSortFilterProxyModelPrivate::_q_sourceColumnsRemoved( source_sort_column = -1; } - proxy_sort_column = q->mapFromSource(model->index(0,source_sort_column, source_parent)).column(); + if (source_sort_column >= 0) + proxy_sort_column = q->mapFromSource(model->index(0,source_sort_column, source_parent)).column(); + else + proxy_sort_column = -1; } void QSortFilterProxyModelPrivate::_q_sourceColumnsAboutToBeMoved( |