From 0ed16a1c5570014abefcc24a8caace3b0967a9b3 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Mon, 23 May 2011 17:08:04 +1000
Subject: [PATCH] Remove the redundant QTEST_ACCESSIBILITY define.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QTEST_ACCESSIBILITY was always defined and only used in one autotest.
Code that uses accessibility features should be excluded if Qt was built
without accessibility rather than based on a define in the test
framework.

Change-Id: I3a517a579a51f536a0983b43bd99e86292026552
Reviewed-by: pending
Reviewed-on: http://codereview.qt.nokia.com/129
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 src/testlib/qtestaccessible.h                    |  6 ++----
 tests/auto/qaccessibility/tst_qaccessibility.cpp | 13 -------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h
index d304a6fc39..9cec1a6bbe 100644
--- a/src/testlib/qtestaccessible.h
+++ b/src/testlib/qtestaccessible.h
@@ -49,8 +49,6 @@
 
 #ifndef QT_NO_ACCESSIBILITY
 
-#define QTEST_ACCESSIBILITY
-
 #define QVERIFY_EVENT(object, child, event) \
     QVERIFY(QTestAccessibility::verifyEvent(object, child, (int)event))
 
@@ -131,9 +129,9 @@ private:
         if (object) {
             QApplication* app = qobject_cast<QApplication*>(object);
             if ( !app )
-                qWarning("QTEST_ACCESSIBILITY: root Object is not a QApplication!");
+                qWarning("%s: root Object is not a QApplication!", Q_FUNC_INFO);
         } else {
-            qWarning("QTEST_ACCESSIBILITY: root Object called with 0 pointer");
+            qWarning("%s: root Object called with 0 pointer", Q_FUNC_INFO);
         }
     }
 
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index 6c0e2611c0..03b2d79bba 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -947,21 +947,16 @@ void tst_QAccessibility::doAction()
 
 void tst_QAccessibility::applicationTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     QLatin1String name = QLatin1String("My Name");
     qApp->setApplicationName(name);
     QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(qApp);
     QCOMPARE(interface->text(QAccessible::Name, 0), name);
     QCOMPARE(interface->role(0), QAccessible::Application);
     delete interface;
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::mainWindowTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     QMainWindow mw;
     mw.resize(300, 200);
     mw.show(); // triggers layout
@@ -974,10 +969,6 @@ void tst_QAccessibility::mainWindowTest()
     QCOMPARE(interface->text(QAccessible::Name, 0), name);
     QCOMPARE(interface->role(0), QAccessible::Window);
     delete interface;
-
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 class CounterButton : public QPushButton {
@@ -1295,7 +1286,6 @@ void tst_QAccessibility::tabTest()
 
 void tst_QAccessibility::tabWidgetTest()
 {
-#ifdef QTEST_ACCESSIBILITY
     QTabWidget *tabWidget = new QTabWidget();
     tabWidget->show();
 
@@ -1381,9 +1371,6 @@ void tst_QAccessibility::tabWidgetTest()
     delete interface;
     delete tabWidget;
     QTestAccessibility::clearEvents();
-#else
-    QSKIP("Test needs accessibility support.", SkipAll);
-#endif
 }
 
 void tst_QAccessibility::menuTest()