diff options
Diffstat (limited to 'tests/auto/widgets')
8 files changed, 2 insertions, 34 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index 8dac4bdfbe..ab18033fa2 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -2264,9 +2264,6 @@ void tst_QGraphicsItem::zValue() QVERIFY(QTest::qWaitForWindowExposed(&view)); QApplication::processEvents(); -#ifdef Q_WS_QWS - QApplication::sendPostedEvents(); //glib workaround -#endif QTRY_VERIFY(!_paintedItems.isEmpty()); QVERIFY((_paintedItems.size() % 4) == 0); diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 7a8e6f1522..b731bec875 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -2951,8 +2951,8 @@ protected: void tst_QGraphicsWidget::respectHFW() { -#if defined(Q_OS_WINCE) || defined(Q_OS_MAC) || defined(Q_WS_QWS) - qDebug("This test is platform dependent, it fails on wince, mac and qws. Please fix."); +#if defined(Q_OS_WINCE) || defined(Q_OS_MAC) + QSKIP("This test is platform dependent, it fails on wince and mac. Please fix."); #else QGraphicsScene scene; HFWWidget *window = new HFWWidget; diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index 6f4faf8c1f..b212a6fdf2 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -896,9 +896,6 @@ void tst_QAbstractItemView::dragAndDrop() { // From Task 137729 -#ifdef Q_WS_QWS - QSKIP("Embedded drag-and-drop not good enough yet..."); -#endif const int attempts = 10; int successes = 0; @@ -937,9 +934,6 @@ void tst_QAbstractItemView::dragAndDrop() void tst_QAbstractItemView::dragAndDropOnChild() { -#ifdef Q_WS_QWS - QSKIP("Embedded drag-and-drop not good enough yet..."); -#endif const int attempts = 10; int successes = 0; diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp index 2e126f49eb..e2e5fac509 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp @@ -468,9 +468,6 @@ void tst_QItemDelegate::font() table.setItem(0, 0, item); QApplication::processEvents(); -#ifdef Q_WS_QWS - QApplication::sendPostedEvents(); //glib workaround -#endif QTRY_COMPARE(delegate->displayText, item->text()); if (properties.contains("italic")) { diff --git a/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp b/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp index d4531bcff1..b9d25967de 100644 --- a/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp +++ b/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp @@ -148,9 +148,6 @@ void tst_QDesktopWidget::screenNumberForQPoint() int screen; screen = desktopWidget->screenNumber(allScreens.topLeft() - QPoint(1, 1)); -#ifdef Q_WS_QWS - QEXPECT_FAIL("", "Task 151710", Abort); -#endif QVERIFY(screen >= 0 && screen < desktopWidget->numScreens()); screen = desktopWidget->screenNumber(allScreens.topRight() + QPoint(1, 1)); QVERIFY(screen >= 0 && screen < desktopWidget->numScreens()); diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp index 85c8a4a9ec..12cdbf5d3d 100644 --- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -750,13 +750,6 @@ void tst_QStyleSheetStyle::focusColors() widgets << combobox; widgets << new QLabel("TESTING TESTING"); -#ifdef Q_WS_QWS - // QWS has its own special focus logic which is slightly different - // and I don't dare change it at this point, because someone will - // be relying on it. It means that setFocus() on a NoFocus widget (i.e. - // a QLabel) will not work before the window is activated. - widgets[2]->setFocusPolicy(Qt::StrongFocus); -#endif foreach (QWidget *widget, widgets) { QDialog frame; @@ -826,10 +819,6 @@ void tst_QStyleSheetStyle::hoverColors() frame.setLayout(layout); frame.show(); -#ifdef Q_WS_QWS -//QWS does not implement enter/leave when windows are shown underneath the cursor - QCursor::setPos(QPoint(0,0)); -#endif QApplication::setActiveWindow(&frame); QVERIFY(QTest::qWaitForWindowActive(&frame)); diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index a6880bc897..dd15080449 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -513,9 +513,6 @@ void tst_QMdiArea::subWindowActivated2() QEXPECT_FAIL("", "showMinimized doesn't really minimize if you don't have access to the server", Abort); #endif QVERIFY(QTest::qWaitForWindowExposed(&mdiArea)); -#if defined(Q_WS_QWS) - QEXPECT_FAIL("", "task 168682", Abort); -#endif #ifdef Q_OS_WINCE QSKIP("Not fixed yet. See Task 197453"); #endif diff --git a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp index 97c740ba7b..f676e887e5 100644 --- a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp +++ b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp @@ -134,9 +134,6 @@ void tst_QToolButton::triggered() tb.setMenu(menu); tb.setDefaultAction(def); -#ifdef Q_WS_QWS - QApplication::processEvents(); //wait for the window system to show the tool button -#endif def->trigger(); QCOMPARE(spy.count(),1); |