summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@trolltech.com>2006-04-10 15:38:58 +0000
committerThiago Macieira <thiago.macieira@trolltech.com>2006-04-10 15:38:58 +0000
commit30682d6358da79012ec2df47d7c7a7cf7dda9638 (patch)
tree4c83637279c296ea3b37e5d4cc26ec9782f57b2b
parentb52b3c14fe4253ef95df69382fc2e040aa0c1fc0 (diff)
* qt/Makefile.am: fix the dependency for
qdbusconnection_p.moc. It's included in qdbusintegrator.cpp, not in qdbusconnection.cpp. Thanks to Jakub Stachowski <stachowski@hypair.net> for spotting this.
-rw-r--r--ChangeLog9
-rw-r--r--qt/Makefile.am3
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 753b44c..e22cb9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,17 @@
+2006-04-10 Thiago Macieira <thiago.macieira@trolltech.com
+
+ * qt/Makefile.am: fix the dependency for
+ qdbusconnection_p.moc. It's included in qdbusintegrator.cpp,
+ not in qdbusconnection.cpp.
+ Thanks to Jakub Stachowski <stachowski@hypair.net> for
+ spotting this.
+
2006-04-10 Thiago Macieira <thiago.macieira@trolltech.com>
* qt/examples/listnames.cpp:
* qt/examples/Makefile.am: Three ways to list the names on the
bus.
+
2006-04-10 Thiago Macieira <thiago.macieira@trolltech.com>
* test/qt/tst_hal.cpp: Remove the waiting, since it's not
diff --git a/qt/Makefile.am b/qt/Makefile.am
index ce35b36..71a7477 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -7,7 +7,6 @@ lib_LTLIBRARIES=libdbus-qt4-1.la
dbusincludedir=$(includedir)/dbus-1.0/dbus
dbusinclude_HEADERS= \
- qdbus.h \
qdbusbus.h \
qdbusmacros.h \
qdbuserror.h \
@@ -61,7 +60,7 @@ qdbusabstractadaptor.lo: qdbusabstractadaptor.moc qdbusabstractadaptor_p.moc
qdbusabstractinterface.lo: qdbusabstractinterface.moc
qdbusbus.lo: qdbusbus.moc
qdbusserver.lo: qdbusserver.moc
-qdbusconnection.lo: qdbusconnection_p.moc
+qdbusintegrator.lo: qdbusconnection_p.moc
CLEANFILES=qdbusabstractadaptor.moc qdbusserver.moc qdbusconnection.moc qdbusconnection_p.moc qdbusabstractadaptor_p.moc qdbusbus.moc qdbusabstractinterface.moc