diff options
| author | Thiago Macieira <thiago@kde.org> | 2006-06-11 12:16:30 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2006-06-11 12:16:30 +0000 |
| commit | 3b50a8c9fe65839b79f8df988aee6124abd4f0c4 (patch) | |
| tree | 3ded141c1f1f88dbbd318dd6106d637ed40a4a69 /qt/examples | |
| parent | a0ccd8a2a0cca7095fc1a9c5e1027e10a44caeee (diff) | |
* 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.
Diffstat (limited to 'qt/examples')
| -rw-r--r-- | qt/examples/Makefile.am | 8 | ||||
| -rw-r--r-- | qt/examples/chat.h | 4 |
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 { |