summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro
diff options
context:
space:
mode:
authorDaniele E. Domenichelli <daniele.domenichelli@gmail.com>2011-04-18 16:21:16 (GMT)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2011-04-18 16:26:27 (GMT)
commit041b89b3905a79a4493399c592797a6321aa29df (patch)
tree7ffe43fc1805b64c67d4f510ea521729dd00fc03 /tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro
parentc48dce786b99acb4bd85863d09df456c03471ef2 (diff)
downloadQt-041b89b3905a79a4493399c592797a6321aa29df.zip
Qt-041b89b3905a79a4493399c592797a6321aa29df.tar.gz
Qt-041b89b3905a79a4493399c592797a6321aa29df.tar.bz2
QtDBus: Add unit tests for QDBusAbstractInterface
Also fix xml in tests/auto/qdbusabstractinterface/com.trolltech.QtDBus.Pinger.xml Merge-request: 2343 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro')
-rw-r--r--tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro17
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