If accessibility isn't built, don't try to test it

Only build the autotest when the feature to be tested is in the Qt
build.  This is better than building and running an empty test.

Change-Id: I67721f5f48296afcca64f761d12325f8e040f2d8
Reviewed-by: Rohan McGovern

2 files changed, 6 insertions, 216 deletions

diff --git a/tests/auto/qaccessibility/qaccessibility.pro b/tests/auto/qaccessibility/qaccessibility.pro
index a4f606c672..71d6f95175 100644
--- a/tests/auto/qaccessibility/qaccessibility.pro
+++ b/tests/auto/qaccessibility/qaccessibility.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+requires(contains(QT_CONFIG,accessibility))
 SOURCES  += tst_qaccessibility.cpp
 
 unix:!mac:LIBS+=-lm
@@ -8,4 +9,4 @@ wince*: {
 	accessneeded.files = $$QT_BUILD_TREE\\plugins\\accessible\\*.dll
 	accessneeded.path = accessible
 	DEPLOYMENT += accessneeded
-}
\ No newline at end of file
+}
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index 35c9e4dae6..888f449f65 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -347,7 +347,6 @@ public:
     }
 };
 
-#ifdef QTEST_ACCESSIBILITY
 class QtTestAccessibleWidgetIface: public QAccessibleWidget
 {
 public:
@@ -365,7 +364,6 @@ public:
         return 0;
     }
 };
-#endif
 
 tst_QAccessibility::tst_QAccessibility()
 {
@@ -377,17 +375,13 @@ tst_QAccessibility::~tst_QAccessibility()
 
 void tst_QAccessibility::initTestCase()
 {
-#ifdef QTEST_ACCESSIBILITY
     QTestAccessibility::initialize();
     QAccessible::installFactory(QtTestAccessibleWidgetIface::ifaceFactory);
-#endif
 }
 
 void tst_QAccessibility::cleanupTestCase()
 {
-#ifdef QTEST_ACCESSIBILITY
     QTestAccessibility::cleanup();
-#endif
 }
 
 void tst_QAccessibility::init()
@@ -397,7 +391,6 @@ void tst_QAccessibility::init()
 
 void tst_QAccessibility::cleanup()
 {
-#ifdef QTEST_ACCESSIBILITY
     const EventList list = QTestAccessibility::events();
     if (!list.isEmpty()) {
         qWarning("%d accessibility event(s) were not handled in testfunction '%s':", list.count(),
@@ -407,14 +400,10 @@ void tst_QAccessibility::cleanup()
                      eventName(list.at(i).event).toAscii().constData(), list.at(i).event, list.at(i).child);
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::eventTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     QPushButton* button = new QPushButton(0);
     button->setObjectName(QString("Olaf"));
 
@@ -430,14 +419,10 @@ void tst_QAccessibility::eventTest()
     QVERIFY_EVENT(button, 0, QAccessible::ObjectHide);
 
     delete button;
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::customWidget()
 {
-#ifdef QTEST_ACCESSIBILITY
     QtTestAccessibleWidget* widget = new QtTestAccessibleWidget(0, "Heinz");
 
     QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(widget);
@@ -449,14 +434,10 @@ void tst_QAccessibility::customWidget()
 
     delete iface;
     delete widget;
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::deletedWidget()
 {
-#ifdef QTEST_ACCESSIBILITY
     QtTestAccessibleWidget *widget = new QtTestAccessibleWidget(0, "Ralf");
     QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(widget);
     QVERIFY(iface != 0);
@@ -467,9 +448,6 @@ void tst_QAccessibility::deletedWidget()
     widget = 0;
     QVERIFY(!iface->isValid());
     delete iface;
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 QWidget *tst_QAccessibility::createGUI()
@@ -478,7 +456,6 @@ QWidget *tst_QAccessibility::createGUI()
     qWarning( "Should never get here without Qt3Support");
     return 0;
 #else
-#  ifdef QTEST_ACCESSIBILITY
     QWidget *toplevel = new QWidget(0, Qt::X11BypassWindowManagerHint);
     QGridLayout *grid = new QGridLayout(toplevel, 2, 2);
 
@@ -550,10 +527,6 @@ QWidget *tst_QAccessibility::createGUI()
     radioAM->setFocus();
     QTestAccessibility::clearEvents();
     return toplevel;
-#  else
-    Q_ASSERT(0); // this function cannot be called without accessibility support
-    return 0;
-#  endif
 #endif // !QT3_SUPPORT
 }
 
@@ -562,7 +535,6 @@ void tst_QAccessibility::childAt()
 #if !defined(QT3_SUPPORT)
     QSKIP("This test needs Qt3Support", SkipAll);
 #else
-#ifdef QTEST_ACCESSIBILITY
     QWidget *toplevel = createGUI();
     QAccessibleInterface *acc_toplevel = QAccessible::queryAccessibleInterface(toplevel);
     QVERIFY(acc_toplevel);
@@ -594,9 +566,6 @@ void tst_QAccessibility::childAt()
     delete acc_toplevel;
     delete toplevel;
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 #endif // !QT3_SUPPORT
 }
 
@@ -605,7 +574,6 @@ void tst_QAccessibility::childCount()
 #if !defined(QT3_SUPPORT)
     QSKIP("This test needs Qt3Support", SkipAll);
 #else
-#ifdef QTEST_ACCESSIBILITY
     QWidget *toplevel = createGUI();
     QObject *topLeft = toplevel->child("topLeft");
     QObject *topRight = toplevel->child("topRight");
@@ -638,9 +606,6 @@ void tst_QAccessibility::childCount()
     delete acc_bottomRight;
     delete toplevel;
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 #endif // !QT3_SUPPORT
 }
 
@@ -649,7 +614,6 @@ void tst_QAccessibility::relationTo()
 #if !defined(QT3_SUPPORT)
     QSKIP("This test needs Qt3Support", SkipAll);
 #else
-#ifdef QTEST_ACCESSIBILITY
     QWidget *toplevel = createGUI();
     toplevel->resize(400,300);
     QObject *topLeft = toplevel->child("topLeft");
@@ -855,15 +819,11 @@ void tst_QAccessibility::relationTo()
     delete toplevel;
 
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 #endif // !QT3_SUPPORT
 }
 
 void tst_QAccessibility::navigateGeometric()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     static const int skip = 20; //speed the test up significantly
     static const double step = Q_PI / 180;
@@ -959,14 +919,10 @@ void tst_QAccessibility::navigateGeometric()
     delete w;
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::navigateSlider()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QSlider *slider = new QSlider(0);
     slider->setObjectName(QString("Slidy"));
@@ -993,14 +949,10 @@ void tst_QAccessibility::navigateSlider()
     delete slider;
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::navigateCovered()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QWidget *w = new QWidget(0);
     w->setObjectName(QString("Harry"));
@@ -1103,14 +1055,10 @@ void tst_QAccessibility::navigateCovered()
     delete w;
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::navigateHierarchy()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QWidget *w = new QWidget(0);
     w->setObjectName(QString("Hans"));
@@ -1206,9 +1154,6 @@ void tst_QAccessibility::navigateHierarchy()
     delete w;
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 #define QSETCOMPARE(thetypename, elements, otherelements) \
@@ -1219,7 +1164,6 @@ void tst_QAccessibility::navigateControllers()
 #if !defined(QT3_SUPPORT)
     QSKIP("This test needs Qt3Support", SkipAll);
 #else
-#ifdef QTEST_ACCESSIBILITY
     {
     Q3VBox vbox;
     QSlider     slider(&vbox);
@@ -1302,9 +1246,6 @@ void tst_QAccessibility::navigateControllers()
     delete acc_slider;
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 #endif // !QT3_SUPPORT
 }
 
@@ -1313,7 +1254,6 @@ void tst_QAccessibility::navigateLabels()
 #if !defined(QT3_SUPPORT)
     QSKIP("This test needs Qt3Support", SkipAll);
 #else
-#ifdef QTEST_ACCESSIBILITY
     {
     Q3VBox vbox;
     Q3HBox hbox(&vbox);
@@ -1435,9 +1375,6 @@ void tst_QAccessibility::navigateLabels()
     delete acc_lineedit3;
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 #endif // !QT3_SUPPORT
 }
 
@@ -1489,7 +1426,6 @@ static QWidget *createWidgets()
 
 void tst_QAccessibility::accessibleName()
 {
-#ifdef QTEST_ACCESSIBILITY
     QWidget *toplevel = createWidgets();
     toplevel->show();
 #if defined(Q_WS_X11)
@@ -1514,9 +1450,6 @@ void tst_QAccessibility::accessibleName()
 
     delete toplevel;
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::text()
@@ -1524,7 +1457,6 @@ void tst_QAccessibility::text()
 #if !defined(QT3_SUPPORT)
     QSKIP("This test needs Qt3Support", SkipAll);
 #else
-#ifdef QTEST_ACCESSIBILITY
     QWidget *toplevel = createGUI();
     toplevel->show();
 #if defined(Q_WS_X11)
@@ -1620,10 +1552,6 @@ void tst_QAccessibility::text()
 
     delete toplevel;
     QTestAccessibility::clearEvents();
-
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 #endif // !QT3_SUPPORT
 }
 
@@ -1632,7 +1560,6 @@ void tst_QAccessibility::setText()
 #if !defined(QT3_SUPPORT)
     QSKIP("This test needs Qt3Support", SkipAll);
 #else
-#ifdef QTEST_ACCESSIBILITY
     QWidget *toplevel = createGUI();
     toplevel->show();
     QObject *bottomLeft = toplevel->findChild<QObject *>("bottomLeft");
@@ -1656,16 +1583,11 @@ void tst_QAccessibility::setText()
     delete acc_lineedit;
     delete toplevel;
     QTestAccessibility::clearEvents();
-
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 #endif //QT3_SUPPORT
 }
 
 void tst_QAccessibility::hideShowTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     QWidget * const window = new QWidget();
     QWidget * const child = new QWidget(window);
 
@@ -1692,14 +1614,10 @@ void tst_QAccessibility::hideShowTest()
 
     delete window;
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::userActionCount()
 {
-#ifdef QTEST_ACCESSIBILITY
     QWidget widget;
 
     QAccessibleInterface *test = QAccessible::queryAccessibleInterface(&widget);
@@ -1729,14 +1647,10 @@ void tst_QAccessibility::userActionCount()
     QCOMPARE(test->userActionCount(1), 0);
     QCOMPARE(test->userActionCount(-1), 0);
     delete test; test = 0;
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::actionText()
 {
-#ifdef QTEST_ACCESSIBILITY
     QWidget widget;
     widget.show();
 
@@ -1753,24 +1667,15 @@ void tst_QAccessibility::actionText()
     QCOMPARE(test->actionText(QAccessible::SetFocus, QAccessible::Name, 0), QString("SetFocus"));
 
     delete test; test = 0;
-
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::doAction()
 {
-#ifdef QTEST_ACCESSIBILITY
     QSKIP("TODO: Implement me", SkipAll);
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::buttonTest()
 {
-//#ifdef QTEST_ACCESSIBILITY
 #if 0
     QAccessibleInterface *test = 0;
     Q3VBox vbox;
@@ -1949,9 +1854,7 @@ void tst_QAccessibility::buttonTest()
     test->release();
 
     QTestAccessibility::clearEvents();
-
 #else
-//    QSKIP("Test needs accessibility support.", SkipAll);
     QSKIP("No action interface in Qt 4 yet.", SkipAll);
 #endif
 }
@@ -1961,7 +1864,6 @@ void tst_QAccessibility::sliderTest()
 #if !defined(QT3_SUPPORT)
     QSKIP("This test needs Qt3Support", SkipAll);
 #else
-#ifdef QTEST_ACCESSIBILITY
     QAccessibleInterface *test = 0;
     Q3VBox vbox;
     QLabel labelHorizontal("Horizontal", &vbox);
@@ -1990,7 +1892,7 @@ void tst_QAccessibility::sliderTest()
     QCOMPARE(test->text(QAccessible::Value, 1), QString());
     QCOMPARE(test->text(QAccessible::Value, 2), QString::number(sliderHorizontal.value()));
     QCOMPARE(test->text(QAccessible::Value, 3), QString());
-// Skip acton tests.
+// Skip action tests.
 #if 0
     QCOMPARE(test->defaultAction(0), QAccessible::SetFocus);
     QCOMPARE(test->defaultAction(1), QAccessible::Press);
@@ -2037,7 +1939,7 @@ void tst_QAccessibility::sliderTest()
     QCOMPARE(test->text(QAccessible::Value, 1), QString());
     QCOMPARE(test->text(QAccessible::Value, 2), QString::number(sliderVertical.value()));
     QCOMPARE(test->text(QAccessible::Value, 3), QString());
-// Skip acton tests.
+// Skip action tests.
 #if 0
     QCOMPARE(test->defaultAction(0), QAccessible::SetFocus);
     QCOMPARE(test->defaultAction(1), QAccessible::Press);
@@ -2148,17 +2050,12 @@ void tst_QAccessibility::sliderTest()
         delete sliderInterface;
     }
 
-
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 #endif //!QT3_SUPPORT
 }
 
 void tst_QAccessibility::scrollBarTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     // Test that when we hide() a slider, the PageLeft, Indicator, and PageRight also gets the
     // Invisible state bit set.
     enum SubControls { LineUp = 1,
@@ -2166,7 +2063,7 @@ void tst_QAccessibility::scrollBarTest()
         Position = 3,
         PageDown = 4,
         LineDown = 5
- };
+    };
 
     QScrollBar *scrollBar  = new QScrollBar();
     QAccessibleInterface * const scrollBarInterface = QAccessible::queryAccessibleInterface(scrollBar);
@@ -2248,15 +2145,10 @@ void tst_QAccessibility::scrollBarTest()
     }
 
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-
 }
 
 void tst_QAccessibility::tabTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     QTabBar *tabBar = new QTabBar();
     tabBar->show();
 
@@ -2292,14 +2184,10 @@ void tst_QAccessibility::tabTest()
     delete tabBar;
     delete interface;
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::menuTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QMainWindow mw;
     mw.resize(300, 200);
@@ -2545,14 +2433,10 @@ void tst_QAccessibility::menuTest()
 
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::spinBoxTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     QSpinBox * const spinBox = new QSpinBox();
     spinBox->show();
 
@@ -2579,14 +2463,10 @@ void tst_QAccessibility::spinBoxTest()
     QVERIFY(events.contains(expectedEvent));
     delete spinBox;
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::doubleSpinBoxTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     QDoubleSpinBox *doubleSpinBox = new QDoubleSpinBox;
     doubleSpinBox->show();
 
@@ -2606,14 +2486,10 @@ void tst_QAccessibility::doubleSpinBoxTest()
 
     delete doubleSpinBox;
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::textEditTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QTextEdit edit;
     QString text = "hello world\nhow are you today?\n";
@@ -2628,14 +2504,10 @@ void tst_QAccessibility::textEditTest()
     QCOMPARE(iface->text(QAccessible::Value, 6), QString());
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::textBrowserTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QTextBrowser textBrowser;
     QString text = QLatin1String("Hello world\nhow are you today?\n");
@@ -2652,14 +2524,10 @@ void tst_QAccessibility::textBrowserTest()
     QCOMPARE(interface->text(QAccessible::Value, 6), QString());
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::listViewTest()
 {
-#if 1 //def QTEST_ACCESSIBILITY
     {
         QListView listView;
         QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(&listView);
@@ -2725,15 +2593,11 @@ void tst_QAccessibility::listViewTest()
 
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 
 void tst_QAccessibility::mdiAreaTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QMdiArea mdiArea;
     mdiArea.resize(400,300);
@@ -2782,14 +2646,10 @@ void tst_QAccessibility::mdiAreaTest()
 
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::mdiSubWindowTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QMdiArea mdiArea;
     mdiArea.show();
@@ -2912,14 +2772,10 @@ void tst_QAccessibility::mdiSubWindowTest()
 
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::lineEditTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     QLineEdit *le = new QLineEdit;
     QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(le);
     QVERIFY(iface);
@@ -2977,14 +2833,10 @@ void tst_QAccessibility::lineEditTest()
     delete le2;
     delete toplevel;
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::workspaceTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QWorkspace workspace;
     workspace.resize(400,300);
@@ -3038,14 +2890,10 @@ void tst_QAccessibility::workspaceTest()
 
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::dialogButtonBoxTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QDialogButtonBox box(QDialogButtonBox::Reset |
                          QDialogButtonBox::Help |
@@ -3158,14 +3006,10 @@ void tst_QAccessibility::dialogButtonBoxTest()
 
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::dialTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QDial dial;
     dial.setValue(20);
@@ -3207,28 +3051,20 @@ void tst_QAccessibility::dialTest()
 
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::rubberBandTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     QRubberBand rubberBand(QRubberBand::Rectangle);
     QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(&rubberBand);
     QVERIFY(interface);
     QCOMPARE(interface->role(0), QAccessible::Border);
     delete interface;
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::abstractScrollAreaTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QAbstractScrollArea abstractScrollArea;
 
@@ -3386,14 +3222,10 @@ void tst_QAccessibility::abstractScrollAreaTest()
     }
 
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::scrollAreaTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QScrollArea scrollArea;
     scrollArea.show();
@@ -3407,14 +3239,10 @@ void tst_QAccessibility::scrollAreaTest()
     delete interface;
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::tableWidgetTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QWidget *topLevel = new QWidget;
     QTableWidget *w = new QTableWidget(8,4,topLevel);
@@ -3454,10 +3282,6 @@ void tst_QAccessibility::tableWidgetTest()
     delete topLevel;
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-
 }
 
 class QtTestTableModel: public QAbstractTableModel
@@ -3540,7 +3364,6 @@ public:
 
 void tst_QAccessibility::tableViewTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     {
     QtTestTableModel *model = new QtTestTableModel(3, 4);
     QTableView *w = new QTableView();
@@ -3620,15 +3443,11 @@ void tst_QAccessibility::tableViewTest()
     delete model;
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::calendarWidgetTest()
 {
 #ifndef QT_NO_CALENDARWIDGET
-#ifdef QTEST_ACCESSIBILITY
     {
     QCalendarWidget calendarWidget;
 
@@ -3721,17 +3540,12 @@ void tst_QAccessibility::calendarWidgetTest()
 
     }
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 #endif // QT_NO_CALENDARWIDGET
 }
 
 void tst_QAccessibility::dockWidgetTest()
 {
 #ifndef QT_NO_DOCKWIDGET
-
-#ifdef QTEST_ACCESSIBILITY
     // Set up a proper main window with two dock widgets
     QMainWindow *mw = new QMainWindow();
     QFrame *central = new QFrame(mw);
@@ -3799,19 +3613,14 @@ void tst_QAccessibility::dockWidgetTest()
     delete dock2;
     delete mw;
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 #endif // QT_NO_DOCKWIDGET
 }
 
 void tst_QAccessibility::pushButtonTest()
 {
 #if !defined(QT3_SUPPORT)
-    qWarning( "Should never get here without Qt3Support");
-    return ;
+    QSKIP( "Should never get here without Qt3Support", SkipAll);
 #else
-#ifdef QTEST_ACCESSIBILITY
     // Set up a proper main window with two dock widgets
     QWidget *toplevel = createGUI();
     QObject *topRight = toplevel->findChild<QObject *>("topRight");
@@ -3845,15 +3654,11 @@ void tst_QAccessibility::pushButtonTest()
     delete accToplevel;
     delete toplevel;
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 #endif //QT3_SUPPORT
 }
 
 void tst_QAccessibility::comboBoxTest()
 {
-#ifdef QTEST_ACCESSIBILITY
 #if defined(Q_OS_WINCE)
     if (!IsValidCEPlatform()) {
         QSKIP("Test skipped on Windows Mobile test hardware", SkipAll);
@@ -3891,15 +3696,10 @@ void tst_QAccessibility::comboBoxTest()
     delete w;
 
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-
 }
 
 void tst_QAccessibility::treeWidgetTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     QWidget *w = new QWidget;
     QTreeWidget *tree = new QTreeWidget(w);
     QHBoxLayout *l = new QHBoxLayout(w);
@@ -3957,14 +3757,10 @@ void tst_QAccessibility::treeWidgetTest()
     delete w;
 
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::labelTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     QString text = "Hello World";
     QLabel *label = new QLabel(text);
     label->show();
@@ -4003,14 +3799,10 @@ void tst_QAccessibility::labelTest()
     delete acc_label;
 
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::accelerators()
 {
-#ifdef QTEST_ACCESSIBILITY
     QWidget *window = new QWidget;
     QHBoxLayout *lay = new QHBoxLayout(window);
     QLabel *label = new QLabel(tr("&Line edit"), window);
@@ -4043,9 +3835,6 @@ void tst_QAccessibility::accelerators()
     QTest::qWait(100);
     delete window;
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll);
-#endif
 }