1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1616664803

Browse Source
This commit is contained in:
Qt CI Bot 2021-03-25 11:48:36 +00:00
commit 5fb347c93d
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/itemmodels/qsortfilterproxymodel.cpp
View File

@ -1714,7 +1714,10 @@ void QSortFilterProxyModelPrivate::_q_sourceColumnsRemoved(
source_sort_column = -1; source_sort_column = -1;
} }
if (source_sort_column >= 0)
proxy_sort_column = q->mapFromSource(model->index(0,source_sort_column, source_parent)).column(); proxy_sort_column = q->mapFromSource(model->index(0,source_sort_column, source_parent)).column();
else
proxy_sort_column = -1;
} }
void QSortFilterProxyModelPrivate::_q_sourceColumnsAboutToBeMoved( void QSortFilterProxyModelPrivate::_q_sourceColumnsAboutToBeMoved(

14
tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/tst_qconcatenatetablesproxymodel.cpp
View File

@ -116,6 +116,7 @@ private Q_SLOTS:
void shouldPropagateDropBetweenItemsAtModelBoundary(); void shouldPropagateDropBetweenItemsAtModelBoundary();
void shouldPropagateDropAfterLastRow_data(); void shouldPropagateDropAfterLastRow_data();
void shouldPropagateDropAfterLastRow(); void shouldPropagateDropAfterLastRow();
void qtbug91788();
private: private:
QStandardItemModel mod; QStandardItemModel mod;
@ -829,6 +830,19 @@ void tst_QConcatenateTablesProxyModel::shouldPropagateDropAfterLastRow()
} }
void tst_QConcatenateTablesProxyModel::qtbug91788()
{
QConcatenateTablesProxyModel proxyConcat;
QStringList strList{QString("one"),QString("two")};
QStringListModel strListModelA(strList);
QSortFilterProxyModel proxyFilter;
proxyFilter.setSourceModel(&proxyConcat);
proxyConcat.addSourceModel(&strListModelA);
proxyConcat.removeSourceModel(&strListModelA); // This should not assert
QCOMPARE(proxyConcat.columnCount(), 0);
}
QTEST_GUILESS_MAIN(tst_QConcatenateTablesProxyModel) QTEST_GUILESS_MAIN(tst_QConcatenateTablesProxyModel)
#include "tst_qconcatenatetablesproxymodel.moc" #include "tst_qconcatenatetablesproxymodel.moc"