diff options
Diffstat (limited to 'tests/auto/widgets')
3 files changed, 38 insertions, 0 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 1be17b552e..5e3cb66aae 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -41,6 +41,7 @@ #include <qcommonstyle.h> #include <qstylefactory.h> #include <qscreen.h> +#include <QSysInfo> typedef QList<QGraphicsItem *> QGraphicsItemList; @@ -1776,10 +1777,16 @@ void tst_QGraphicsWidget::updateFocusChainWhenChildDie() #ifdef Q_OS_MAC QEXPECT_FAIL("", "QTBUG-23699", Continue); #endif +#ifdef Q_OS_WIN + if (QSysInfo::kernelVersion() == "10.0.15063") { + QEXPECT_FAIL("", "This fails on Windows 10 Creators Update (10.0.15063)", Continue); + } +#endif QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view)); QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w)); } + void tst_QGraphicsWidget::sizeHint_data() { QTest::addColumn<bool>("layout"); diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index 9e9431520f..a63ca49cbb 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -153,6 +153,7 @@ private slots: void testClickToSelect(); void testDialogAsEditor(); void QTBUG46785_mouseout_hover_state(); + void testClearModelInClickedSignal(); }; class MyAbstractItemDelegate : public QAbstractItemDelegate @@ -2270,5 +2271,29 @@ void tst_QAbstractItemView::QTBUG46785_mouseout_hover_state() QTRY_VERIFY(delegate.m_paintedWithoutHover); } +void tst_QAbstractItemView::testClearModelInClickedSignal() +{ + QStringList list{"A", "B"}; + QStringListModel model(list); + + QListView view; + view.setModel(&model); + view.show(); + + QWidget::connect(&view, &QListView::clicked, [&view](const QModelIndex &index) + { + view.setModel(nullptr); + QCOMPARE(index.data().toString(), QStringLiteral("B")); + }); + + QModelIndex index = view.model()->index(1, 0); + QVERIFY(index.isValid()); + QPoint p = view.visualRect(index).center(); + + QTest::mouseClick(view.viewport(), Qt::LeftButton, Qt::NoModifier, p); + + QCOMPARE(view.model(), nullptr); +} + QTEST_MAIN(tst_QAbstractItemView) #include "tst_qabstractitemview.moc" diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 096beedf63..d328163a05 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -1774,6 +1774,12 @@ void tst_QWidget::activation() QCOMPARE(QApplication::activeWindow(), &widget2); widget2.hide(); QTest::qWait(waitTime); +#ifdef Q_OS_WIN + if (QSysInfo::kernelVersion() == "10.0.15063") { + QEXPECT_FAIL("", "This fails on Windows 10 Creators Update (10.0.15063)", Continue); + // This happens in automated Windows 10 Creators Update (10.0.15063) CI builds! + } +#endif QCOMPARE(QApplication::activeWindow(), &widget1); } #endif // Q_OS_WIN |