diff options
Diffstat (limited to 'qt/examples')
-rw-r--r-- | qt/examples/Makefile.am | 8 | ||||
-rw-r--r-- | qt/examples/complexpong.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/qt/examples/Makefile.am b/qt/examples/Makefile.am index 7906f28b..5d1e0542 100644 --- a/qt/examples/Makefile.am +++ b/qt/examples/Makefile.am @@ -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 @@ chat.o: chatmainwindow.h chatsetnickname.h chatinterface.h chatadaptor.h chat.mo 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 @@ CLEANFILES = chat.moc chatadaptor.moc complexping.moc complexpong.moc pong.moc \ $(QT_MOC) $< > $@ %.h: %.ui $(QT_UIC) -o $@ $? -endif diff --git a/qt/examples/complexpong.h b/qt/examples/complexpong.h index eaf5065f..c6ad2dbb 100644 --- a/qt/examples/complexpong.h +++ b/qt/examples/complexpong.h @@ -28,7 +28,7 @@ class Pong: public QDBusAbstractAdaptor { 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; |