summaryrefslogtreecommitdiffstats
path: root/avahi-qt/qt-watch.cpp
diff options
context:
space:
mode:
authorJakub Stachowski <qbast@go2.pl>2005-08-29 22:35:06 +0000
committerJakub Stachowski <qbast@go2.pl>2005-08-29 22:35:06 +0000
commit4ddfb3cc4ac10efff11fc58693ae2aacf592fb73 (patch)
tree6de976ac6e5e9fe6bb5535e583bb408398990b7e /avahi-qt/qt-watch.cpp
parent520f6eb0e117cc9010a307cf1ec9237188e663ee (diff)
Include qt mainloop adapter in build system. Moc finding code is cracktastic thanks to
not providing its location in .pc file and debian that renames it to moc-qt3 and moc-qt4 git-svn-id: file:///home/lennart/svn/public/avahi/trunk@495 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-qt/qt-watch.cpp')
-rw-r--r--avahi-qt/qt-watch.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/avahi-qt/qt-watch.cpp b/avahi-qt/qt-watch.cpp
index 407a905..c5052fd 100644
--- a/avahi-qt/qt-watch.cpp
+++ b/avahi-qt/qt-watch.cpp
@@ -170,7 +170,7 @@ static void q_timeout_free(AvahiTimeout *t)
static AvahiPoll qt_poll;
-const AvahiPoll* avahi_qt_poll_get()
+const AvahiPoll* avahi_qt_poll_get(void)
{
qt_poll.userdata=0;
qt_poll.watch_new = q_watch_new;
@@ -184,4 +184,8 @@ const AvahiPoll* avahi_qt_poll_get()
return &qt_poll;
}
-#include "qt-watch.moc"
+#ifdef QT4
+#include "qt-watch.moc4"
+#else
+#include "qt-watch.moc3"
+#endif