* 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.

diff --git a/ChangeLog b/ChangeLog
index 753b44c341f88aebf318980ec67e527624c7233e..e22cb9faf14d3d9cf3477c5eccf9d786e9e25f12 100644 (file)
--- 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 ce35b36ffc86c17ef3126ee78ca68541b2ae1215..71a747704925792341c510854e3e00e3c9e10b64 100644 (file)
--- 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