From 3b50a8c9fe65839b79f8df988aee6124abd4f0c4 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 11 Jun 2006 12:16:30 +0000 Subject: * qt/tools/dbuscpp2xml.cpp: Compile on Windows. * qt/tools/dbusidl2cpp.cpp: Add missing newline. * qt/examples/Makefile.am: * qt/examples/chat.h: Use UI-generated files with the ui_*.h form. * qt/src/qdbusmarshall.cpp: Allow sending of QString() and QByteArray() (nulls) over the bus. * qt/src/qdbusabstractinterface.cpp: Use the correct variable, the one that has the signature suffix stripped. * qt/src/qdbusreply.h: Make some methods const. --- qt/examples/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'qt/examples/Makefile.am') diff --git a/qt/examples/Makefile.am b/qt/examples/Makefile.am index ab569448..5b5e733e 100644 --- a/qt/examples/Makefile.am +++ b/qt/examples/Makefile.am @@ -5,9 +5,9 @@ if HAVE_QT_GUI chat_LDADD = $(LDADD) $(DBUS_QT_GUI_LIBS) dist_chat_SOURCES = chat.cpp chat.h chatadaptor.cpp nodist_chat_SOURCES = chatinterface.cpp -chat.o: chatmainwindow.h chatsetnickname.h chatinterface.h chatadaptor.h chat.moc chatadaptor.moc -chatmainwindow.h: chatmainwindow.ui -chatsetnickname.h: chatsetnickname.ui +chat.o: ui_chatmainwindow.h ui_chatsetnickname.h chatinterface.h chatadaptor.h chat.moc chatadaptor.moc +ui_chatmainwindow.h: chatmainwindow.ui +ui_chatsetnickname.h: chatsetnickname.ui chatinterface.cpp chatinterface.h: com.trolltech.ChatInterface.xml ../tools/dbusidl2cpp -m -p chatinterface $? $(QT_MOC) -o chatinterface.moc chatinterface.h @@ -37,6 +37,6 @@ CLEANFILES = chat.moc chatadaptor.moc complexping.moc complexpong.moc pong.moc \ %.moc: %.h $(QT_MOC) $< > $@ -%.h: %.ui +ui_%.h: %.ui $(QT_UIC) -o $@ $? -- cgit