From a165cbb1f0516f214351ebb6df7d64c8ea2f617a Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 11 Oct 2011 11:47:50 +1000
Subject: 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>
---
 tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro     | 1 -
 tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp | 4 ----
 2 files changed, 5 deletions(-)

(limited to 'tests/auto/dbus/qdbuspendingreply')

diff --git a/tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro b/tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro
index c649e4aaf5..9eca779290 100644
--- a/tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro
+++ b/tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro
@@ -1,4 +1,3 @@
 load(qttest_p4)
-requires(contains(QT_CONFIG, dbus))
 QT = core dbus
 SOURCES += tst_qdbuspendingreply.cpp
diff --git a/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp b/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp
index 18177181fb..9eb69392c4 100644
--- a/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp
+++ b/tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp
@@ -43,7 +43,6 @@
 #include <QtCore/QList>
 #include <QtCore/QVector>
 #include <QtTest/QtTest>
-#ifndef QT_NO_DBUS
 #include <QtDBus>
 
 typedef QMap<int,QString> IntStringMap;
@@ -592,6 +591,3 @@ void tst_QDBusPendingReply::errors()
 QTEST_MAIN(tst_QDBusPendingReply)
 
 #include "tst_qdbuspendingreply.moc"
-#else
-QTEST_NOOP_MAIN
-#endif
-- 
cgit v1.2.3