diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-03 16:25:39 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-03 16:25:39 (GMT) |
| commit | ac0a7503d58946b38d4d18bb077dd9530ccbb6f9 (patch) | |
| tree | 3e16b713e0269147f9d362e7c1384768e98b2c1e /tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro | |
| parent | bf0926fff333398660fd51ae6b08699783100057 (diff) | |
| parent | 399782c7911c11bba80dd37276f8de0b171c52f8 (diff) | |
| download | Qt-ac0a7503d58946b38d4d18bb077dd9530ccbb6f9.zip Qt-ac0a7503d58946b38d4d18bb077dd9530ccbb6f9.tar.gz Qt-ac0a7503d58946b38d4d18bb077dd9530ccbb6f9.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro')
| -rw-r--r-- | tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro b/tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro index a4853b8..f9077b9 100644 --- a/tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro +++ b/tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro @@ -1,15 +1,10 @@ load(qttest_p4) -QT = core -contains(QT_CONFIG,dbus): { - SOURCES += tst_qdbusabstractinterface.cpp interface.cpp - HEADERS += interface.h - QT += dbus - - # These are generated sources - # To regenerate, see the command-line at the top of the files - SOURCES += pinger.cpp - HEADERS += pinger.h +contains(QT_CONFIG,dbus): { + TEMPLATE = subdirs + CONFIG += ordered + SUBDIRS = qpinger test +} else { + SOURCES += ../qdbusmarshall/dummy.cpp } -else:SOURCES += ../qdbusmarshall/dummy.cpp OTHER_FILES += com.trolltech.QtDBus.Pinger.xml |