whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Jason McDonald 2011-10-11 11:47:50 +10:00 committed by Qt by Nokia
parent 0f957eef90
commit a165cbb1f0
20 changed files with 38 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro
View File

@ -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

11
tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro
View File

@ -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

12
tests/auto/dbus/qdbusconnection/qdbusconnection.pro
View File

@ -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

10
tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro
View File

@ -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

12
tests/auto/dbus/qdbuscontext/qdbuscontext.pro
View File

@ -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

12
tests/auto/dbus/qdbusinterface/qdbusinterface.pro
View File

@ -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

12
tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro
View File

@ -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

44
tests/auto/dbus/qdbusmarshall/dummy.cpp
View File

@ -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

16
tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro
View File

@ -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))

11
tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro
View File

@ -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

11
tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro
View File

@ -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

1
tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro
View File

@ -1,5 +1,4 @@
load(qttest_p4)
requires(contains(QT_CONFIG, dbus))
QT = core dbus
SOURCES += tst_qdbuspendingcall.cpp

4
tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
View File

@ -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

1
tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro
View File

@ -1,4 +1,3 @@
load(qttest_p4)
requires(contains(QT_CONFIG, dbus))
QT = core dbus
SOURCES += tst_qdbuspendingreply.cpp

4
tests/auto/dbus/qdbuspendingreply/tst_qdbuspendingreply.cpp
View File

@ -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

11
tests/auto/dbus/qdbusreply/qdbusreply.pro
View File

@ -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

9
tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro
View File

@ -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

12
tests/auto/dbus/qdbusthreading/qdbusthreading.pro
View File

@ -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

13
tests/auto/dbus/qdbustype/qdbustype.pro
View File

@ -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

11
tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro
View File

@ -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