AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't call virtual functions with data from an old model

Browse Source 
Change-Id: I4f1ec56ce722110042f72761bbc2976e580b7149
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
BogDan Vatra 2016-08-04 11:43:44 +03:00
parent f200d5e824
commit bc4ce55fff
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/itemviews/qabstractitemview.cpp
View File

@ -769,8 +769,10 @@ void QAbstractItemView::setSelectionModel(QItemSelectionModel *selectionModel)
QModelIndex oldCurrentIndex; QModelIndex oldCurrentIndex;
if (d->selectionModel) { if (d->selectionModel) {
if (d->selectionModel->model() == selectionModel->model()) {
oldSelection = d->selectionModel->selection(); oldSelection = d->selectionModel->selection();
oldCurrentIndex = d->selectionModel->currentIndex(); oldCurrentIndex = d->selectionModel->currentIndex();
}
disconnect(d->selectionModel, SIGNAL(selectionChanged(QItemSelection,QItemSelection)), disconnect(d->selectionModel, SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
this, SLOT(selectionChanged(QItemSelection,QItemSelection))); this, SLOT(selectionChanged(QItemSelection,QItemSelection)));

43
tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
View File

@ -1939,11 +1939,18 @@ void tst_QAbstractItemView::QTBUG50535_update_on_new_selection_model()
{ {
public: public:
ListView() ListView()
: m_paintEventsCount(0) : m_paintEventsCount(0), m_deselectedMustBeEmpty(false), m_selectionChangedOk(true)
{ {
} }
void setSelectionModel(QItemSelectionModel *model) Q_DECL_OVERRIDE
{
m_deselectedMustBeEmpty = !selectionModel() || !model || selectionModel()->model() != model->model();
QListView::setSelectionModel(model);
m_deselectedMustBeEmpty = false;
}
int m_paintEventsCount; int m_paintEventsCount;
bool selectionChangedOk() const { return m_selectionChangedOk; }
protected: protected:
bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE
@ -1952,6 +1959,24 @@ void tst_QAbstractItemView::QTBUG50535_update_on_new_selection_model()
++m_paintEventsCount; ++m_paintEventsCount;
return QListView::viewportEvent(event); return QListView::viewportEvent(event);
} }
void selectionChanged(const QItemSelection &selected,
const QItemSelection &deselected) Q_DECL_OVERRIDE
{
if (m_deselectedMustBeEmpty && !deselected.isEmpty())
m_selectionChangedOk = false;
// Make sure both selections belong to the same model
foreach (const QModelIndex &nmi, selected.indexes()) {
foreach (const QModelIndex &omi, deselected.indexes()) {
m_selectionChangedOk = m_selectionChangedOk && (nmi.model() == omi.model());
}
}
QListView::selectionChanged(selected, deselected);
}
private:
bool m_deselectedMustBeEmpty;
bool m_selectionChangedOk;
}; };
// keep the current/selected row in the "low range", i.e. be sure it's visible, otherwise we // keep the current/selected row in the "low range", i.e. be sure it's visible, otherwise we
@ -1962,7 +1987,7 @@ void tst_QAbstractItemView::QTBUG50535_update_on_new_selection_model()
view.selectionModel()->setCurrentIndex(model.index(1, 0), QItemSelectionModel::SelectCurrent); view.selectionModel()->setCurrentIndex(model.index(1, 0), QItemSelectionModel::SelectCurrent);
view.show(); view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowExposed(&view));
QVERIFY(view.selectionChangedOk());
QItemSelectionModel selectionModel(&model); QItemSelectionModel selectionModel(&model);
selectionModel.setCurrentIndex(model.index(2, 0), QItemSelectionModel::Current); selectionModel.setCurrentIndex(model.index(2, 0), QItemSelectionModel::Current);
@ -1970,6 +1995,7 @@ void tst_QAbstractItemView::QTBUG50535_update_on_new_selection_model()
int oldPaintEventsCount = view.m_paintEventsCount; int oldPaintEventsCount = view.m_paintEventsCount;
view.setSelectionModel(&selectionModel); view.setSelectionModel(&selectionModel);
QTRY_VERIFY(view.m_paintEventsCount > oldPaintEventsCount); QTRY_VERIFY(view.m_paintEventsCount > oldPaintEventsCount);
QVERIFY(view.selectionChangedOk());
QItemSelectionModel selectionModel2(&model); QItemSelectionModel selectionModel2(&model);
@ -1979,6 +2005,19 @@ void tst_QAbstractItemView::QTBUG50535_update_on_new_selection_model()
oldPaintEventsCount = view.m_paintEventsCount; oldPaintEventsCount = view.m_paintEventsCount;
view.setSelectionModel(&selectionModel2); view.setSelectionModel(&selectionModel2);
QTRY_VERIFY(view.m_paintEventsCount > oldPaintEventsCount); QTRY_VERIFY(view.m_paintEventsCount > oldPaintEventsCount);
QVERIFY(view.selectionChangedOk());
// Tests QAbstractItemView::selectionChanged
QStandardItemModel model1;
for (int i = 0; i < 10; ++i)
model1.appendRow(new QStandardItem(QString::number(i)));
view.setModel(&model1);
QItemSelectionModel selectionModel1(&model1);
selectionModel1.select(model1.index(0, 0), QItemSelectionModel::ClearAndSelect);
selectionModel1.setCurrentIndex(model1.index(1, 0), QItemSelectionModel::Current);
view.setSelectionModel(&selectionModel1);
QVERIFY(view.selectionChangedOk());
} }
void tst_QAbstractItemView::testSelectionModelInSyncWithView() void tst_QAbstractItemView::testSelectionModelInSyncWithView()