dbus/test/qt Makefile.am,1.1,1.2 tst_qdbusconnection.cpp,1.1,1.2

[Harald Fernengel]

Update of /cvs/dbus/dbus/test/qt
In directory gabe:/tmp/cvs-serv19637

Modified Files:
	Makefile.am tst_qdbusconnection.cpp 
Log Message:
compile out of the box


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/test/qt/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	23 Sep 2005 16:24:36 -0000	1.1
+++ Makefile.am	30 Sep 2005 15:05:33 -0000	1.2
@@ -14,13 +14,13 @@
 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) $< > $@

Index: tst_qdbusconnection.cpp
===================================================================
RCS file: /cvs/dbus/dbus/test/qt/tst_qdbusconnection.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tst_qdbusconnection.cpp	23 Sep 2005 16:24:36 -0000	1.1
+++ tst_qdbusconnection.cpp	30 Sep 2005 15:05:33 -0000	1.2
@@ -3,7 +3,7 @@
 
 #include <QtTest/QtTest>
 
-#include <qdbus.h>
+#include <dbus/qdbus.h>
 
 class tst_QDBusConnection: public QObject
 {