Don't build empty qaccessibility test on WinCE.

Rather than building the test with all the logic #ifdef'd out, just
avoid building the test at all.

Change-Id: I394f48b2dacb40325d03de719096da36fcb7312a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index e3adaa2..0381b6c 100644 (file)
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -6,6 +6,7 @@ SUBDIRS=\
            other \
 #           baselineexample \ Just an example demonstrating qbaselinetest usage
            lancelot \
+           qaccessibility \
            qcombobox \
            qfocusevent \
            qlayout \
@@ -22,7 +23,7 @@ SUBDIRS=\
            windowsmobile \
            qmetaobjectbuilder
 
-contains(QT_CONFIG, accessibility):SUBDIRS += qaccessibility
+wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility
 
 mac:!qpa {
     SUBDIRS += macgui \

diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index b98ef4a..7d66506 100644 (file)
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -41,7 +41,6 @@
 
 
 #include <QtTest/QtTest>
-#ifndef Q_OS_WINCE
 #include "../../shared/util.h"
 #include <QtGui>
 #include <QtWidgets>
@@ -3410,13 +3409,5 @@ void tst_QAccessibility::accelerators()
     QTestAccessibility::clearEvents();
 }
 
-
 QTEST_MAIN(tst_QAccessibility)
-
-#else // Q_OS_WINCE
-
-QTEST_NOOP_MAIN
-
-#endif  // Q_OS_WINCE
-
 #include "tst_qaccessibility.moc"