diff options
Diffstat (limited to 'tests/auto/widgets/itemviews')
13 files changed, 11 insertions, 66 deletions
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index ba4c1473e8..42cbad14c0 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -1278,9 +1278,6 @@ void tst_QAbstractItemView::task250754_fontChange() font.setPixelSize(60); tree.setFont(font); -#ifdef Q_OS_WINRT - QSKIP("Resizing the widget does not work as expected for WinRT, so the scroll bar might not be visible"); -#endif //now with the huge items, the scrollbar must be visible QTRY_VERIFY(tree.verticalScrollBar()->isVisible()); @@ -1602,9 +1599,6 @@ void tst_QAbstractItemView::testClickedSignal() QSignalSpy clickedSpy(&view, &QTableWidget::clicked); QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, p); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "Fails on WinRT - QTBUG-68297", Abort); -#endif QCOMPARE(clickedSpy.count(), 1); QTest::mouseClick(view.viewport(), Qt::RightButton, {}, p); @@ -2311,9 +2305,6 @@ void tst_QAbstractItemView::QTBUG46785_mouseout_hover_state() QTest::mouseMove(table.viewport(), QPoint(-50, 0)); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "QTest::mouseMove does not work on WinRT", Abort); -#endif QTRY_VERIFY(delegate.m_paintedWithoutHover); } diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp index 5ac144340d..cca791fe5a 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp @@ -924,10 +924,9 @@ void tst_QColumnView::parentCurrentIndex() QTRY_COMPARE(view.createdColumns[0]->currentIndex(), first); QTRY_COMPARE(view.createdColumns[1]->currentIndex(), second); -#ifndef Q_OS_WINRT // The next two lines should be removed when QTBUG-22707 is resolved. QEXPECT_FAIL("", "QTBUG-22707", Abort); -#endif + QVERIFY(view.createdColumns[2]); QTRY_COMPARE(view.createdColumns[2]->currentIndex(), third); diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index bb098f32c2..1553b6e982 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -706,8 +706,6 @@ void tst_QHeaderView::sectionSize() { #if defined Q_OS_QNX QSKIP("The section size is dpi dependent on QNX"); -#elif defined Q_OS_WINRT - QSKIP("Fails on WinRT - QTBUG-68297"); #endif QFETCH(const IntList, boundsCheck); QFETCH(const IntList, defaultSizes); @@ -809,8 +807,6 @@ void tst_QHeaderView::visualIndexAt() { #if defined Q_OS_QNX QSKIP("The section size is dpi dependent on QNX"); -#elif defined Q_OS_WINRT - QSKIP("Fails on WinRT - QTBUG-68297"); #endif QFETCH(const IntList, hidden); QFETCH(const IntList, from); @@ -1843,10 +1839,6 @@ void tst_QHeaderView::restoreBeforeSetModel() void tst_QHeaderView::defaultSectionSizeTest() { -#if defined Q_OS_WINRT - QSKIP("Fails on WinRT - QTBUG-73309"); -#endif - // Setup QTableView qtv; QHeaderView *hv = qtv.verticalHeader(); @@ -2169,9 +2161,6 @@ void tst_QHeaderView::preserveHiddenSectionWidth() void tst_QHeaderView::invisibleStretchLastSection() { -#ifdef Q_OS_WINRT - QSKIP("Fails on WinRT - QTBUG-68297"); -#endif int count = 6; QStandardItemModel model(1, count); QHeaderView view(Qt::Horizontal); diff --git a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt index af1bac9ff0..dfdf263431 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt @@ -16,7 +16,7 @@ add_qt_test(tst_qitemdelegate ## Scopes: ##################################################################### -extend_target(tst_qitemdelegate CONDITION WIN32 AND NOT WINRT +extend_target(tst_qitemdelegate CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro b/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro index 916694fd0f..fc617b0e5d 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro +++ b/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro @@ -3,4 +3,4 @@ TARGET = tst_qitemdelegate QT += widgets widgets-private testlib SOURCES += tst_qitemdelegate.cpp -win32:!winrt: QMAKE_USE += user32 +win32: QMAKE_USE += user32 diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp index a9d2b413f0..36ab1a64a6 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp @@ -58,7 +58,7 @@ Q_DECLARE_METATYPE(QAbstractItemDelegate::EndEditHint) -#if defined (Q_OS_WIN) && !defined(Q_OS_WINRT) +#if defined (Q_OS_WIN) #include <windows.h> #define Q_CHECK_PAINTEVENTS \ if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \ diff --git a/tests/auto/widgets/itemviews/qitemview/BLACKLIST b/tests/auto/widgets/itemviews/qitemview/BLACKLIST deleted file mode 100644 index d5fc89f204..0000000000 --- a/tests/auto/widgets/itemviews/qitemview/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[scrollTo] -winrt diff --git a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt index 07c290128e..6e14ba5c99 100644 --- a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt @@ -19,7 +19,7 @@ add_qt_test(tst_qlistview ## Scopes: ##################################################################### -extend_target(tst_qlistview CONDITION WIN32 AND NOT WINRT +extend_target(tst_qlistview CONDITION WIN32 PUBLIC_LIBRARIES user32 ) diff --git a/tests/auto/widgets/itemviews/qlistview/qlistview.pro b/tests/auto/widgets/itemviews/qlistview/qlistview.pro index c3e19adc81..7e2062e86e 100644 --- a/tests/auto/widgets/itemviews/qlistview/qlistview.pro +++ b/tests/auto/widgets/itemviews/qlistview/qlistview.pro @@ -2,4 +2,4 @@ CONFIG += testcase TARGET = tst_qlistview QT += widgets gui-private widgets-private core-private testlib testlib-private SOURCES += tst_qlistview.cpp -win32:!winrt: QMAKE_USE += user32 +win32: QMAKE_USE += user32 diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp index 8c1cff79ec..79ce1e970e 100644 --- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp +++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp @@ -125,7 +125,7 @@ private slots: void scrollBarAsNeeded(); void moveItems(); void wordWrap(); -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) void setCurrentIndexAfterAppendRowCrash(); #endif void emptyItemSize(); @@ -1415,13 +1415,10 @@ void tst_QListView::wordWrap() lv.showNormal(); QTRY_COMPARE(lv.horizontalScrollBar()->isVisible(), false); -#ifdef Q_OS_WINRT -QSKIP("setFixedSize does not work on WinRT. Vertical scroll bar will not be visible."); -#endif QTRY_COMPARE(lv.verticalScrollBar()->isVisible(), true); } -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) class SetCurrentIndexAfterAppendRowCrashDialog : public QDialog { Q_OBJECT @@ -1473,7 +1470,7 @@ void tst_QListView::setCurrentIndexAfterAppendRowCrash() SetCurrentIndexAfterAppendRowCrashDialog w; w.exec(); } -#endif // Q_OS_WIN && !Q_OS_WINRT +#endif // Q_OS_WIN void tst_QListView::emptyItemSize() { @@ -2058,9 +2055,6 @@ void tst_QListView::taskQTBUG_21115_scrollToAndHiddenItems_data() void tst_QListView::taskQTBUG_21115_scrollToAndHiddenItems() { QFETCH(QListView::Flow, flow); -#ifdef Q_OS_WINRT - QSKIP("Fails on WinRT - QTBUG-68297"); -#endif ScrollPerItemListView lv; lv.setUniformItemSizes(true); @@ -2253,9 +2247,6 @@ void tst_QListView::testScrollToWithHidden() lv.scrollTo(model.index(26, 0)); int expectedScrollBarValue = lv.verticalScrollBar()->value(); -#ifdef Q_OS_WINRT - QSKIP("Might fail on WinRT - QTBUG-68297"); -#endif QVERIFY(expectedScrollBarValue != 0); lv.scrollTo(model.index(25, 0)); diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index ccc6997f26..aa5a05f9dc 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -2329,14 +2329,6 @@ void tst_QTableView::rowViewportPosition() view.setVerticalScrollMode(verticalScrollMode); view.verticalScrollBar()->setValue(verticalScrollValue); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("row 1, scroll per item, 1", "Fails on WinRT - QTBUG-68297", Abort); - QEXPECT_FAIL("row 5, scroll per item, 5", "Fails on WinRT - QTBUG-68297", Abort); - QEXPECT_FAIL("row 9, scroll per item, 5", "Fails on WinRT - QTBUG-68297", Abort); - QEXPECT_FAIL("row 1, scroll per pixel, 1", "Fails on WinRT - QTBUG-68297", Abort); - QEXPECT_FAIL("row 5, scroll per pixel, 5", "Fails on WinRT - QTBUG-68297", Abort); - QEXPECT_FAIL("row 9, scroll per pixel, 5", "Fails on WinRT - QTBUG-68297", Abort); -#endif QCOMPARE(view.rowViewportPosition(row), rowViewportPosition); } @@ -2500,13 +2492,6 @@ void tst_QTableView::columnViewportPosition() view.setHorizontalScrollMode(horizontalScrollMode); view.horizontalScrollBar()->setValue(horizontalScrollValue); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("column 5, scroll per item, 5", "Fails on WinRT - QTBUG-68297", Abort); - QEXPECT_FAIL("column 9, scroll per item, 5", "Fails on WinRT - QTBUG-68297", Abort); - QEXPECT_FAIL("column 1, scroll per pixel 1", "Fails on WinRT - QTBUG-68297", Abort); - QEXPECT_FAIL("column 5, scroll per pixel 5", "Fails on WinRT - QTBUG-68297", Abort); - QEXPECT_FAIL("column 9, scroll per pixel 5", "Fails on WinRT - QTBUG-68297", Abort); -#endif QCOMPARE(view.columnViewportPosition(column), columnViewportPosition); } diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index 760dcac608..f85b885b34 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -893,9 +893,6 @@ void tst_QTreeView::horizontalScrollMode() QCOMPARE(view.horizontalScrollMode(), QAbstractItemView::ScrollPerPixel); QCOMPARE(view.horizontalScrollBar()->minimum(), 0); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "setFixedSize does not work on WinRT - QTBUG-68297", Abort); -#endif QVERIFY(view.horizontalScrollBar()->maximum() > 2); view.setHorizontalScrollMode(QAbstractItemView::ScrollPerItem); @@ -2068,10 +2065,6 @@ void tst_QTreeView::setSelection() QVERIFY(selectionModel); const QModelIndexList selectedIndexes = selectionModel->selectedIndexes(); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("(0,-20,20,50),rows", "Fails on WinRT - QTBUG-68297", Abort); - QEXPECT_FAIL("(0,-50,20,90),rows", "Fails on WinRT - QTBUG-68297", Abort); -#endif QCOMPARE(selectedIndexes.count(), expectedItems.count()); for (const QModelIndex &idx : selectedIndexes) QVERIFY(expectedItems.contains(QPoint(idx.column(), idx.row()))); diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp index 17617e0734..009086eebd 100644 --- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp @@ -3487,9 +3487,8 @@ void tst_QTreeWidget::taskQTBUG_34717_collapseAtBottom() void tst_QTreeWidget::task20345_sortChildren() { - if (!QGuiApplication::platformName().compare(QLatin1String("wayland"), Qt::CaseInsensitive) - || !QGuiApplication::platformName().compare(QLatin1String("winrt"), Qt::CaseInsensitive)) - QSKIP("Wayland/WinRT: This causes a crash triggered by setVisible(false)"); + if (!QGuiApplication::platformName().compare(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This causes a crash triggered by setVisible(false)"); // This test case is considered successful if it is executed (no crash in sorting) QTreeWidget tw; |