diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-11 17:36:37 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-17 03:30:55 +0200 |
commit | 9e31f88d7a5038070a1f2956d4d6fd043c62df36 (patch) | |
tree | 430e7249b5744796af28626691e8a01884a5b3a8 | |
parent | e33713f03acf45372aaa5f5c9169b11a919beaa4 (diff) |
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>
-rw-r--r-- | tests/auto/other.pro | 3 | ||||
-rw-r--r-- | tests/auto/qaccessibility/tst_qaccessibility.cpp | 9 |
2 files changed, 2 insertions, 10 deletions
diff --git a/tests/auto/other.pro b/tests/auto/other.pro index e3adaa218e..0381b6c89d 100644 --- 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 b98ef4ae5b..7d6650608c 100644 --- 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" |