From a165cbb1f0516f214351ebb6df7d64c8ea2f617a Mon Sep 17 00:00:00 2001 From: Jason McDonald 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 Reviewed-by: Rohan McGovern --- tests/auto/dbus/qdbustype/qdbustype.pro | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'tests/auto/dbus/qdbustype/qdbustype.pro') 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 -- cgit v1.2.3