dbus/qt/examples Makefile.am,1.2,1.3 complexpong.h,1.1,1.2

[Thiago J. Macieira]

Update of /cvs/dbus/dbus/qt/examples
In directory kemper:/tmp/cvs-serv5955/qt/examples

Modified Files:
	Makefile.am complexpong.h 
Log Message:
	* qt/: Update to Subversion r548032.
	This includes a big reorganisation of the files inside the
	subdir.

We really need a version control system that supports moving of
files. I'm not bothering with history anyways anymore, since the
bindings will be moved out to git. The history should be restored from
Subversion when that happens.


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/qt/examples/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	10 Apr 2006 10:56:50 -0000	1.2
+++ Makefile.am	4 Jun 2006 15:52:05 -0000	1.3
@@ -1,6 +1,5 @@
-if HAVE_QT
-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_QT_CFLAGS) -DDBUS_COMPILATION
-LDADD = ../libdbus-qt4-1.la
+INCLUDES=-I$(top_srcdir)/qt $(DBUS_CLIENT_CFLAGS) $(DBUS_QT_CFLAGS) -DDBUS_COMPILATION
+LDADD = ../src/libdbus-qt4-1.la
 
 if HAVE_QT_GUI
 chat_LDADD = $(LDADD) $(DBUS_QT_GUI_LIBS)
@@ -10,7 +9,7 @@
 chatmainwindow.h: chatmainwindow.ui
 chatsetnickname.h: chatsetnickname.ui
 chatinterface.cpp chatinterface.h: com.trolltech.ChatInterface.xml
-	../dbusidl2cpp -m -p chatinterface $?
+	../tools/dbusidl2cpp -m -p chatinterface $?
 	$(QT_MOC) -o chatinterface.moc chatinterface.h
 
 CHAT=chat
@@ -41,5 +40,4 @@
 	$(QT_MOC) $< > $@
 %.h: %.ui
 	$(QT_UIC) -o $@ $?
-endif
 

Index: complexpong.h
===================================================================
RCS file: /cvs/dbus/dbus/qt/examples/complexpong.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- complexpong.h	28 Mar 2006 19:16:35 -0000	1.1
+++ complexpong.h	4 Jun 2006 15:52:05 -0000	1.2
@@ -28,7 +28,7 @@
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "com.trolltech.QtDBus.ComplexPong.Pong")
-    Q_PROPERTY(QString value READ value WRITE setValue);
+    Q_PROPERTY(QString value READ value WRITE setValue)
 public:
     QString m_value;
     QString value() const;