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>

20 files changed, 38 insertions, 189 deletions

diff --git a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro
index 480509853f..09ab7ac98f 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro
+++ b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro
@@ -1,9 +1,5 @@
 load(qttest_p4)
 QT = core core-private
-contains(QT_CONFIG,dbus): {
-    TEMPLATE = subdirs
-    CONFIG += ordered
-    SUBDIRS = qmyserver test
-} else {
-    SOURCES += ../qdbusmarshall/dummy.cpp
-}
+TEMPLATE = subdirs
+CONFIG += ordered
+SUBDIRS = qmyserver test
diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro
index f9077b92cf..05e0c51084 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro
+++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro
@@ -1,10 +1,5 @@
 load(qttest_p4)
-contains(QT_CONFIG,dbus): {
-    TEMPLATE = subdirs
-    CONFIG += ordered
-    SUBDIRS = qpinger test
-} else {
-    SOURCES += ../qdbusmarshall/dummy.cpp
-}
-
+TEMPLATE = subdirs
+CONFIG += ordered
+SUBDIRS = qpinger test
 OTHER_FILES += com.trolltech.QtDBus.Pinger.xml
diff --git a/tests/auto/dbus/qdbusconnection/qdbusconnection.pro b/tests/auto/dbus/qdbusconnection/qdbusconnection.pro
index d33ab0d95b..cbc7a979eb 100644
--- a/tests/auto/dbus/qdbusconnection/qdbusconnection.pro
+++ b/tests/auto/dbus/qdbusconnection/qdbusconnection.pro
@@ -1,11 +1,3 @@
 load(qttest_p4)
-QT = core
-
-contains(QT_CONFIG,dbus): {
-	SOURCES += tst_qdbusconnection.cpp
-	QT += dbus
-} else {
-	SOURCES += ../qdbusmarshall/dummy.cpp
-}
-
-
+QT = core dbus
+SOURCES += tst_qdbusconnection.cpp
diff --git a/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro b/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro
index 86d08ea0d4..2eae2e045b 100644
--- a/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro
+++ b/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro
@@ -1,9 +1,3 @@
 load(qttest_p4)
-QT = core
-
-contains(QT_CONFIG,dbus): {
-    SOURCES += tst_qdbusconnection_no_bus.cpp
-    QT += dbus
-} else {
-    SOURCES += ../qdbusmarshall/dummy.cpp
-}
+QT = core dbus
+SOURCES += tst_qdbusconnection_no_bus.cpp
diff --git a/tests/auto/dbus/qdbuscontext/qdbuscontext.pro b/tests/auto/dbus/qdbuscontext/qdbuscontext.pro
index ddd340c37e..23fc22f440 100644
--- a/tests/auto/dbus/qdbuscontext/qdbuscontext.pro
+++ b/tests/auto/dbus/qdbuscontext/qdbuscontext.pro
@@ -1,11 +1,3 @@
 load(qttest_p4)
-QT = core
-
-contains(QT_CONFIG,dbus): {
-	SOURCES += tst_qdbuscontext.cpp
-	QT += dbus
-} else {
-	SOURCES += ../qdbusmarshall/dummy.cpp
-}
-
-
+QT = core dbus
+SOURCES += tst_qdbuscontext.cpp
diff --git a/tests/auto/dbus/qdbusinterface/qdbusinterface.pro b/tests/auto/dbus/qdbusinterface/qdbusinterface.pro
index 0aca06ceb4..8992828009 100644
--- a/tests/auto/dbus/qdbusinterface/qdbusinterface.pro
+++ b/tests/auto/dbus/qdbusinterface/qdbusinterface.pro
@@ -1,11 +1,5 @@
 load(qttest_p4)
 QT = core
-contains(QT_CONFIG,dbus): {
-    TEMPLATE = subdirs
-    CONFIG += ordered
-    SUBDIRS = qmyserver test
-} else {
-    SOURCES += ../qdbusmarshall/dummy.cpp
-}
-
-
+TEMPLATE = subdirs
+CONFIG += ordered
+SUBDIRS = qmyserver test
diff --git a/tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro b/tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro
index cef3ddcb28..3375bb53a6 100644
--- a/tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro
+++ b/tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro
@@ -1,11 +1,3 @@
 load(qttest_p4)
-QT = core
-
-contains(QT_CONFIG,dbus): {
-	SOURCES += tst_qdbuslocalcalls.cpp
-	QT += dbus
-} else {
-	SOURCES += ../qdbusmarshall/dummy.cpp
-}
-
-
+QT = core dbus
+SOURCES += tst_qdbuslocalcalls.cpp
diff --git a/tests/auto/dbus/qdbusmarshall/dummy.cpp b/tests/auto/dbus/qdbusmarshall/dummy.cpp
deleted file mode 100644
index 0b403c3585..0000000000
--- a/tests/auto/dbus/qdbusmarshall/dummy.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QtTest/QtTest>
-
-QTEST_NOOP_MAIN
-
diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro
index 1b6408a2f9..dc2145aba2 100644
--- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro
+++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro
@@ -1,14 +1,8 @@
 load(qttest_p4)
-contains(QT_CONFIG,dbus): {
-	TEMPLATE = subdirs
-	CONFIG += ordered
-	SUBDIRS = qpong test
-
-        QT += core-private
-
-        requires(contains(QT_CONFIG,private_tests))
-} else {
-	SOURCES += dummy.cpp
-}
+TEMPLATE = subdirs
+CONFIG += ordered
+SUBDIRS = qpong test
 
+QT += core-private
 
+requires(contains(QT_CONFIG,private_tests))
diff --git a/tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro b/tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro
index fa59c06c8e..c2dec0993c 100644
--- a/tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro
+++ b/tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro
@@ -1,10 +1,3 @@
 load(qttest_p4)
-QT = core
-contains(QT_CONFIG,dbus): {
-	SOURCES += tst_qdbusmetaobject.cpp
-	QT += dbus dbus-private
-} else {
-	SOURCES += ../qdbusmarshall/dummy.cpp
-}
-
-
+QT = core dbus-private
+SOURCES += tst_qdbusmetaobject.cpp
diff --git a/tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro b/tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro
index da8fbec01a..15b97de70c 100644
--- a/tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro
+++ b/tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro
@@ -1,10 +1,3 @@
 load(qttest_p4)
-QT = core
-contains(QT_CONFIG,dbus): {
-	SOURCES += tst_qdbusmetatype.cpp
-	QT += dbus
-} else {
-	SOURCES += ../qdbusmarshall/dummy.cpp
-}
-
-
+QT = core dbus
+SOURCES += tst_qdbusmetatype.cpp
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
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
diff --git a/tests/auto/dbus/qdbusreply/qdbusreply.pro b/tests/auto/dbus/qdbusreply/qdbusreply.pro
index c96116c0ab..492a3a7bc4 100644
--- a/tests/auto/dbus/qdbusreply/qdbusreply.pro
+++ b/tests/auto/dbus/qdbusreply/qdbusreply.pro
@@ -1,10 +1,3 @@
 load(qttest_p4)
-QT = core
-contains(QT_CONFIG,dbus): {
-	SOURCES += tst_qdbusreply.cpp
-	QT += dbus
-} else {
-	SOURCES += ../qdbusmarshall/dummy.cpp
-}
-
-
+QT = core dbus
+SOURCES += tst_qdbusreply.cpp
diff --git a/tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro b/tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro
index 4970f16863..51f5f90687 100644
--- a/tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro
+++ b/tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro
@@ -1,8 +1,3 @@
 load(qttest_p4)
-QT = core
-contains(QT_CONFIG,dbus): {
-        SOURCES += tst_qdbusservicewatcher.cpp
-        QT += dbus
-} else {
-        SOURCES += ../qdbusmarshall/dummy.cpp
-}
+QT = core dbus
+SOURCES += tst_qdbusservicewatcher.cpp
diff --git a/tests/auto/dbus/qdbusthreading/qdbusthreading.pro b/tests/auto/dbus/qdbusthreading/qdbusthreading.pro
index e239e9861e..f8f319d960 100644
--- a/tests/auto/dbus/qdbusthreading/qdbusthreading.pro
+++ b/tests/auto/dbus/qdbusthreading/qdbusthreading.pro
@@ -1,11 +1,3 @@
 load(qttest_p4)
-QT = core
-
-contains(QT_CONFIG,dbus): {
-	SOURCES += tst_qdbusthreading.cpp
-	QT += dbus
-} else {
-	SOURCES += ../qdbusmarshall/dummy.cpp
-}
-
-
+QT = core dbus
+SOURCES += tst_qdbusthreading.cpp
diff --git a/tests/auto/dbus/qdbustype/qdbustype.pro b/tests/auto/dbus/qdbustype/qdbustype.pro
index 9b6808b562..1ae84384b7 100644
--- a/tests/auto/dbus/qdbustype/qdbustype.pro
+++ b/tests/auto/dbus/qdbustype/qdbustype.pro
@@ -1,10 +1,5 @@
 load(qttest_p4)
-QT = core core-private
-contains(QT_CONFIG,dbus): {
-        SOURCES += tst_qdbustype.cpp
-        QT += dbus dbus-private
-        QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
-        LIBS_PRIVATE += $$QT_LIBS_DBUS
-} else {
-        SOURCES += ../qdbusmarshall/dummy.cpp
-}
+QT = core-private dbus-private
+SOURCES += tst_qdbustype.cpp
+QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
+LIBS_PRIVATE += $$QT_LIBS_DBUS
diff --git a/tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro b/tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro
index 0ac0d9e198..da95823168 100644
--- a/tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro
+++ b/tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro
@@ -1,10 +1,3 @@
 load(qttest_p4)
-QT = core core-private
-contains(QT_CONFIG,dbus): {
-	SOURCES += tst_qdbusxmlparser.cpp
-	QT += dbus dbus-private
-} else {
-	SOURCES += ../qdbusmarshall/dummy.cpp
-}
-
-
+QT = core-private dbus-private
+SOURCES += tst_qdbusxmlparser.cpp