diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-11 11:47:50 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-11 07:02:14 +0200 |
commit | a165cbb1f0516f214351ebb6df7d64c8ea2f617a (patch) | |
tree | 38ab86a4a15c60dcaa71d0623ada55af35694dea /tests/auto/dbus/qdbuspendingcall | |
parent | 0f957eef90d107ebcde07e787a7973f6366eac6b (diff) |
Remove redundant logic from dbus test .pro files.
There was logic in .pro files for the dbus tests to omit the body of
each test if dbus was not available in the Qt build. This was all
redundant however, because tests/auto/auto.pro already excluded all dbus
tests if dbus was not available in the Qt build.
Change-Id: Iaea06e38622e5227daec4d2e08106c2da3fb4013
Reviewed-on: http://codereview.qt-project.org/6372
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/dbus/qdbuspendingcall')
-rw-r--r-- | tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro | 1 | ||||
-rw-r--r-- | tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro b/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro index 74708c8103..aff27e5cb3 100644 --- a/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro +++ b/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro @@ -1,5 +1,4 @@ load(qttest_p4) -requires(contains(QT_CONFIG, dbus)) QT = core dbus SOURCES += tst_qdbuspendingcall.cpp diff --git a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp index 7bdf9c561b..c0bfd606d2 100644 --- a/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp +++ b/tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp @@ -44,7 +44,6 @@ #include <QtCore/QThread> #include <QtCore/QVector> #include <QtTest/QtTest> -#ifndef QT_NO_DBUS #include <QtDBus> #define TEST_INTERFACE_NAME "com.trolltech.QtDBus.MyObject" @@ -551,6 +550,3 @@ void tst_QDBusPendingCall::callInsideWaitForFinished() QTEST_MAIN(tst_QDBusPendingCall) #include "tst_qdbuspendingcall.moc" -#else -QTEST_NOOP_MAIN -#endif |