summaryrefslogtreecommitdiffstats
path: root/dbus
diff options
context:
space:
mode:
authorThiago Macieira <thiago@kde.org>2006-03-06 14:29:39 +0000
committerThiago Macieira <thiago@kde.org>2006-03-06 14:29:39 +0000
commit9393d6b459d02a8508750a846bf97a69e48c97e2 (patch)
tree4cf83534dc0ea77ce63819b0358f6f72820db9bc /dbus
parent305ce15e4f0568d5eeb8ca169c4fb0f77e50fcb4 (diff)
2006-03-06 Thiago Macieira <thiago.macieira@trolltech.com>
* qt/*: * dbus/qdbus.h: Sync with KDE Subversion revision 516237. This represents the first feature-complete version of the Qt4 bindings since I took ove maintainership.
Diffstat (limited to 'dbus')
-rw-r--r--dbus/qdbus.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/dbus/qdbus.h b/dbus/qdbus.h
index ef6e8084..5d5c1f7a 100644
--- a/dbus/qdbus.h
+++ b/dbus/qdbus.h
@@ -26,17 +26,29 @@
#include <QtCore/qglobal.h>
#ifndef DBUS_COMPILATION
-# define QDBUS_EXPORT Q_DECL_IMPORT
+# include <dbus/qdbusabstractadaptor.h>
# include <dbus/qdbusconnection.h>
# include <dbus/qdbuserror.h>
+# include <dbus/qdbusinterface.h>
+# include <dbus/qdbusintrospection.h>
# include <dbus/qdbusmessage.h>
+# include <dbus/qdbusobject.h>
+# include <dbus/qdbusreply.h>
# include <dbus/qdbusserver.h>
+# include <dbus/qdbustype.h>
+# include <dbus/qdbusutil.h>
#else
-# define QDBUS_EXPORT Q_DECL_EXPORT
+# include <qt/qdbusabstractadaptor.h>
# include <qt/qdbusconnection.h>
# include <qt/qdbuserror.h>
+# include <qt/qdbusinterface.h>
+# include <qt/qdbusintrospection.h>
# include <qt/qdbusmessage.h>
+# include <qt/qdbusobject.h>
+# include <qt/qdbusreply.h>
# include <qt/qdbusserver.h>
+# include <qt/qdbustype.h>
+# include <qt/qdbusutil.h>
#endif
#endif