diff options
| author | Thiago Macieira <thiago@kde.org> | 2006-06-04 16:02:16 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2006-06-04 16:02:16 +0000 |
| commit | 54b762aa4c692596f70892f7fb3d7e495bd8268a (patch) | |
| tree | 297c2175e90cfd3956fc181274521039b138bb8b | |
| parent | da04480e7e4cdf2da8a36210e1286f22f595eac8 (diff) | |
* dbus/Makefile.am:
* dbus/qdbus.h: Remove unnecessary file. This is mirrored into
qt/dbus/qdbus.h now.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | dbus/Makefile.am | 8 | ||||
| -rw-r--r-- | dbus/qdbus.h | 52 |
3 files changed, 8 insertions, 58 deletions
@@ -1,5 +1,11 @@ 2006-06-04 Thiago Macieira <thiago.macieira@trolltech.com> + * dbus/Makefile.am: + * dbus/qdbus.h: Remove unnecessary file. This is mirrored into + qt/dbus/qdbus.h now. + +2006-06-04 Thiago Macieira <thiago.macieira@trolltech.com> + * configure.in: Make --disable-qt actually do something. Patch inspired by Zack Rusin. diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 88c50b02..060827b9 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -15,10 +15,6 @@ 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 @@ -40,8 +36,8 @@ dbusinclude_HEADERS= \ dbus-signature.h \ dbus-threads.h \ dbus-types.h \ - $(GLIB_INCLUDES) \ - $(QT_INCLUDES) + $(GLIB_INCLUDES) + dbusarchinclude_HEADERS= \ dbus-arch-deps.h diff --git a/dbus/qdbus.h b/dbus/qdbus.h deleted file mode 100644 index 60f2f1e3..00000000 --- a/dbus/qdbus.h +++ /dev/null @@ -1,52 +0,0 @@ -/* 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> - -#if !defined(DBUS_COMPILATION) -# include <dbus/qdbusabstractadaptor.h> -# include <dbus/qdbusabstractinterface.h> -# include <dbus/qdbusbus.h> -# include <dbus/qdbusconnection.h> -# include <dbus/qdbuserror.h> -# include <dbus/qdbusinterface.h> -# include <dbus/qdbusmessage.h> -# include <dbus/qdbusreply.h> -# include <dbus/qdbusserver.h> -# include <dbus/qdbusutil.h> -#else -# include <qt/qdbusabstractadaptor.h> -# include <qt/qdbusabstractinterface.h> -# include <qt/qdbusbus.h> -# include <qt/qdbusconnection.h> -# include <qt/qdbuserror.h> -# include <qt/qdbusinterface.h> -# include <qt/qdbusmessage.h> -# include <qt/qdbusreply.h> -# include <qt/qdbusserver.h> -# include <qt/qdbusutil.h> -#endif - -#endif |