compile out of the box

diff --git a/test/qt/Makefile.am b/test/qt/Makefile.am
index 553accd46daa9a32dc4f9b8acece57ad20d3f0f5..c8be4c2e3cb3dde311e5c06b0f9981d454d74d24 100644 (file)
--- a/test/qt/Makefile.am
+++ b/test/qt/Makefile.am
@@ -14,13 +14,13 @@ noinst_PROGRAMS= $(TEST_BINARIES)
 qdbusconnection_SOURCES= \
        tst_qdbusconnection.cpp
 
-$(top_srcdir)/test/qt/tst_qdbusconnection.cpp: tst_qdbusconnection.moc
+tst_qdbusconnection.cpp: tst_qdbusconnection.moc
 
-TEST_LIBS=$(DBUS_QTESTLIB_LIBS) $(top_builddir)/qt/libdbus-qt-1.la
+tst_qdbusconnection.moc:
+       $(QT_MOC) tst_qdbusconnection.cpp > tst_qdbusconnection.moc
+
+TEST_LIBS=$(DBUS_QTESTLIB_LIBS) $(top_builddir)/qt/libdbus-qt4-1.la
 
 qdbusconnection_LDADD=$(TEST_LIBS)
 
 CLEANFILES=tst_qdbusconnection.moc
-
-%.moc: %.cpp
-       $(QT_MOC) $< > $@

diff --git a/test/qt/tst_qdbusconnection.cpp b/test/qt/tst_qdbusconnection.cpp
index 50ed0bde813def00ec350febed0e9244698561e9..6b6095bd0bf00c1331322944fbc457f9cec3c5db 100644 (file)
--- a/test/qt/tst_qdbusconnection.cpp
+++ b/test/qt/tst_qdbusconnection.cpp
@@ -3,7 +3,7 @@
 
 #include <QtTest/QtTest>
 
-#include <qdbus.h>
+#include <dbus/qdbus.h>
 
 class tst_QDBusConnection: public QObject
 {