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

Fix compilation with Qt 6

Browse Source 
Change-Id: Ie165ab2f17740a996112b7e918b595d5873674a1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Lars Knoll 2019-05-02 09:21:38 +02:00
parent 1b8a1e04ef
commit 5ced1ff9fc
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -734,7 +734,7 @@ void tst_QStandardItemModel::data()
currentRoles.clear(); currentRoles.clear();
// bad args // bad args
m_model->setData(QModelIndex(), "bla", Qt::DisplayRole); m_model->setData(QModelIndex(), "bla", Qt::DisplayRole);
QCOMPARE(currentRoles, {}); QCOMPARE(currentRoles, QVector<int>{});
QIcon icon; QIcon icon;
for (int r=0; r < m_model->rowCount(); ++r) { for (int r=0; r < m_model->rowCount(); ++r) {
@ -742,9 +742,9 @@ void tst_QStandardItemModel::data()
m_model->setData(m_model->index(r,c), "initialitem", Qt::DisplayRole); m_model->setData(m_model->index(r,c), "initialitem", Qt::DisplayRole);
QCOMPARE(currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole})); QCOMPARE(currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole}));
m_model->setData(m_model->index(r,c), "tooltip", Qt::ToolTipRole); m_model->setData(m_model->index(r,c), "tooltip", Qt::ToolTipRole);
QCOMPARE(currentRoles, {Qt::ToolTipRole}); QCOMPARE(currentRoles, QVector<int>{Qt::ToolTipRole});
m_model->setData(m_model->index(r,c), icon, Qt::DecorationRole); m_model->setData(m_model->index(r,c), icon, Qt::DecorationRole);
QCOMPARE(currentRoles, {Qt::DecorationRole}); QCOMPARE(currentRoles, QVector<int>{Qt::DecorationRole});
} }
} }
@ -761,7 +761,7 @@ void tst_QStandardItemModel::clearItemData()
{ {
currentRoles.clear(); currentRoles.clear();
QVERIFY(!m_model->clearItemData(QModelIndex())); QVERIFY(!m_model->clearItemData(QModelIndex()));
QCOMPARE(currentRoles, {}); QCOMPARE(currentRoles, QVector<int>{});
const QModelIndex idx = m_model->index(0, 0); const QModelIndex idx = m_model->index(0, 0);
const QMap<int, QVariant> oldData = m_model->itemData(idx); const QMap<int, QVariant> oldData = m_model->itemData(idx);
m_model->setData(idx, QLatin1String("initialitem"), Qt::DisplayRole); m_model->setData(idx, QLatin1String("initialitem"), Qt::DisplayRole);
@ -773,7 +773,7 @@ void tst_QStandardItemModel::clearItemData()
QCOMPARE(idx.data(Qt::ToolTipRole), QVariant()); QCOMPARE(idx.data(Qt::ToolTipRole), QVariant());
QCOMPARE(idx.data(Qt::DisplayRole), QVariant()); QCOMPARE(idx.data(Qt::DisplayRole), QVariant());
QCOMPARE(idx.data(Qt::EditRole), QVariant()); QCOMPARE(idx.data(Qt::EditRole), QVariant());
QCOMPARE(currentRoles, {}); QCOMPARE(currentRoles, QVector<int>{});
m_model->setItemData(idx, oldData); m_model->setItemData(idx, oldData);
currentRoles.clear(); currentRoles.clear();
} }

4
tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
View File

@ -1525,11 +1525,11 @@ void tst_QListWidget::itemData()
item.setData(Qt::DisplayRole, QString("0")); item.setData(Qt::DisplayRole, QString("0"));
QCOMPARE(widget.currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole})); QCOMPARE(widget.currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole}));
item.setData(Qt::CheckStateRole, Qt::PartiallyChecked); item.setData(Qt::CheckStateRole, Qt::PartiallyChecked);
QCOMPARE(widget.currentRoles, {Qt::CheckStateRole}); QCOMPARE(widget.currentRoles, QVector<int>{Qt::CheckStateRole});
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
{ {
item.setData(Qt::UserRole + i, QString::number(i + 1)); item.setData(Qt::UserRole + i, QString::number(i + 1));
QCOMPARE(widget.currentRoles, {Qt::UserRole + i}); QCOMPARE(widget.currentRoles, QVector<int>{Qt::UserRole + i});
} }
QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0)); QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0));
QCOMPARE(flags.count(), 6); QCOMPARE(flags.count(), 6);

4
tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
View File

@ -1383,11 +1383,11 @@ void tst_QTableWidget::itemData()
item->setData(Qt::DisplayRole, QString("0")); item->setData(Qt::DisplayRole, QString("0"));
QCOMPARE(widget.currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole})); QCOMPARE(widget.currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole}));
item->setData(Qt::CheckStateRole, Qt::PartiallyChecked); item->setData(Qt::CheckStateRole, Qt::PartiallyChecked);
QCOMPARE(widget.currentRoles, {Qt::CheckStateRole}); QCOMPARE(widget.currentRoles, QVector<int>{Qt::CheckStateRole});
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
{ {
item->setData(Qt::UserRole + i, QString::number(i + 1)); item->setData(Qt::UserRole + i, QString::number(i + 1));
QCOMPARE(widget.currentRoles, {Qt::UserRole + i}); QCOMPARE(widget.currentRoles, QVector<int>{Qt::UserRole + i});
} }
QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0)); QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0));
QCOMPARE(flags.count(), 6); QCOMPARE(flags.count(), 6);

4
tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
View File

@ -1999,10 +1999,10 @@ void tst_QTreeWidget::itemData()
item.setData(0, Qt::DisplayRole, QString("0")); item.setData(0, Qt::DisplayRole, QString("0"));
QCOMPARE(widget.currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole})); QCOMPARE(widget.currentRoles, QVector<int>({Qt::DisplayRole, Qt::EditRole}));
item.setData(0, Qt::CheckStateRole, Qt::PartiallyChecked); item.setData(0, Qt::CheckStateRole, Qt::PartiallyChecked);
QCOMPARE(widget.currentRoles, {Qt::CheckStateRole}); QCOMPARE(widget.currentRoles, QVector<int>{Qt::CheckStateRole});
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
item.setData(0, Qt::UserRole + i, QString::number(i + 1)); item.setData(0, Qt::UserRole + i, QString::number(i + 1));
QCOMPARE(widget.currentRoles, {Qt::UserRole + i}); QCOMPARE(widget.currentRoles, QVector<int>{Qt::UserRole + i});
} }
QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0)); QMap<int, QVariant> flags = widget.model()->itemData(widget.model()->index(0, 0));
QCOMPARE(flags.count(), 6); QCOMPARE(flags.count(), 6);