diff options
| author | Harald Fernengel <harry@kdevelop.org> | 2005-09-23 16:24:36 +0000 |
|---|---|---|
| committer | Harald Fernengel <harry@kdevelop.org> | 2005-09-23 16:24:36 +0000 |
| commit | cd883ae0436e0be1234cd0cde3c2e9a8b994d0e8 (patch) | |
| tree | e911fc2383e9fc4d91cb51774e4037efa439acd2 /dbus | |
| parent | ac2de419da28379195da11120ddb0e19f601aa24 (diff) | |
adding an autotest and "dbus-ify" the build process and include scheme
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/Makefile.am | 7 | ||||
| -rw-r--r-- | dbus/qdbus.h | 42 |
2 files changed, 48 insertions, 1 deletions
diff --git a/dbus/Makefile.am b/dbus/Makefile.am index b6b50d70..7e927f21 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -15,6 +15,10 @@ dbus-glib-error-enum.h: dbus-protocol.h make-dbus-glib-error-enum.sh endif +if HAVE_QT +QT_INCLUDES=qdbus.h +endif + dbusincludedir=$(includedir)/dbus-1.0/dbus dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus @@ -35,7 +39,8 @@ dbusinclude_HEADERS= \ dbus-shared.h \ dbus-threads.h \ dbus-types.h \ - $(GLIB_INCLUDES) + $(GLIB_INCLUDES) \ + $(QT_INCLUDES) dbusarchinclude_HEADERS= \ dbus-arch-deps.h diff --git a/dbus/qdbus.h b/dbus/qdbus.h new file mode 100644 index 00000000..ef6e8084 --- /dev/null +++ b/dbus/qdbus.h @@ -0,0 +1,42 @@ +/* qdbus.h precompiled header + * + * Copyright (C) 2005 Harald Fernengel <harry@kdevelop.org> + * + * Licensed under the Academic Free License version 2.1 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef QDBUS_H +#define QDBUS_H + +#include <QtCore/qglobal.h> + +#ifndef DBUS_COMPILATION +# define QDBUS_EXPORT Q_DECL_IMPORT +# include <dbus/qdbusconnection.h> +# include <dbus/qdbuserror.h> +# include <dbus/qdbusmessage.h> +# include <dbus/qdbusserver.h> +#else +# define QDBUS_EXPORT Q_DECL_EXPORT +# include <qt/qdbusconnection.h> +# include <qt/qdbuserror.h> +# include <qt/qdbusmessage.h> +# include <qt/qdbusserver.h> +#endif + +#endif |