summaryrefslogtreecommitdiffstats
path: root/qt/examples
diff options
context:
space:
mode:
Diffstat (limited to 'qt/examples')
-rw-r--r--qt/examples/Makefile.am8
-rw-r--r--qt/examples/chat.h4
2 files changed, 6 insertions, 6 deletions
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 $@ $?
diff --git a/qt/examples/chat.h b/qt/examples/chat.h
index 12c33d4c..b0e50a35 100644
--- a/qt/examples/chat.h
+++ b/qt/examples/chat.h
@@ -24,8 +24,8 @@
#include <QtCore/QStringList>
#include <dbus/qdbus.h>
-#include "chatmainwindow.h"
-#include "chatsetnickname.h"
+#include "ui_chatmainwindow.h"
+#include "ui_chatsetnickname.h"
class ChatMainWindow: public QMainWindow, Ui::ChatMainWindow
{