diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-11 17:42:44 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-17 03:30:55 +0200 |
commit | fe48366b48473282d448a8b0dd6fb9286272f465 (patch) | |
tree | 562494f9b22116ab872ea7c69f597d39e45e7852 /tests | |
parent | 55f15606055852d511bebe0d5b59a0ae9d9d4fc1 (diff) | |
download | qtbase-fe48366b48473282d448a8b0dd6fb9286272f465.tar.gz |
Don't build empty qwineventnotifier test.
This test is only useful on Windows, so avoid building it elsewhere
rather than building an empty test.
Change-Id: I01d91266bcb2dd242e02e70741ad5b81a13c33f0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/corelib/kernel/kernel.pro | 3 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro index 9fb8868391..42fda6f300 100644 --- a/tests/auto/corelib/kernel/kernel.pro +++ b/tests/auto/corelib/kernel/kernel.pro @@ -20,3 +20,6 @@ SUBDIRS=\ !contains(QT_CONFIG, private_tests): SUBDIRS -= \ qsocketnotifier + +# This test is only applicable on Windows +!win32*:SUBDIRS -= qwineventnotifier diff --git a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp index cbe62f6662..c351167ce8 100644 --- a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp +++ b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp @@ -41,11 +41,7 @@ #include <QtTest/QtTest> - -#ifdef Q_OS_WIN #include <private/qwineventnotifier_p.h> - - #include <qtimer.h> //TESTED_CLASS= @@ -140,7 +136,3 @@ void tst_QWinEventNotifier::simple() QTEST_MAIN(tst_QWinEventNotifier) #include "tst_qwineventnotifier.moc" -#else // non-windows systems -QTEST_NOOP_MAIN -#endif - |