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/qdbustype/qdbustype.pro | |
| 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/qdbustype/qdbustype.pro')
| -rw-r--r-- | tests/auto/dbus/qdbustype/qdbustype.pro | 13 |
1 files changed, 4 insertions, 9 deletions
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 |