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

QStandardItemModel: Reset the flags on clear()

Browse Source 
Pass modeltest after clear().  Otherwise it fails because more flags
than Qt::ItemIsDropEnabled get returned for the QModelIndex().

Change-Id: I8f11515cc7dc9383f528f785312ffb77b3c2699d
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Stephen Kelly 2016-02-15 12:51:25 +01:00
parent a44d7862c8
commit bfeb2fdd79
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/itemmodels/qstandarditemmodel.cpp
View File

@ -2168,6 +2168,7 @@ void QStandardItemModel::clear()
Q_D(QStandardItemModel);
beginResetModel();
d->root.reset(new QStandardItem);
d->root->setFlags(Qt::ItemIsDropEnabled);
d->root->d_func()->setModel(this);
qDeleteAll(d->columnHeaderItems);
d->columnHeaderItems.clear();

6
tests/auto/gui/itemmodels/qstandarditemmodel/qstandarditemmodel.pro
View File

@ -4,6 +4,10 @@ TARGET = tst_qstandarditemmodel
QT += widgets widgets-private testlib
QT += core-private gui-private
SOURCES += tst_qstandarditemmodel.cpp
mtdir = ../../../other/modeltest
INCLUDEPATH += $${mtdir}
SOURCES += $${mtdir}/modeltest.cpp tst_qstandarditemmodel.cpp
HEADERS += $${mtdir}/modeltest.h

4
tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
View File

@ -32,6 +32,7 @@
#include <qstandarditemmodel.h>
#include <QTreeView>
#include <private/qtreeview_p.h>
#include "modeltest.h"
class tst_QStandardItemModel : public QObject
{
@ -734,6 +735,9 @@ void tst_QStandardItemModel::clear()
QSignalSpy modelResetSpy(&model, SIGNAL(modelReset()));
QSignalSpy layoutChangedSpy(&model, SIGNAL(layoutChanged()));
QSignalSpy rowsRemovedSpy(&model, SIGNAL(rowsRemoved(QModelIndex,int,int)));
ModelTest mt(&model);
model.clear();
QCOMPARE(modelResetSpy.count(), 1);