diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-11-24 23:41:00 -0800 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-12-01 20:03:33 +0100 |
| commit | a2da88712f1e057747f68a28361b300faac5e605 (patch) | |
| tree | 2835260dd00fbca0287edcf1329db7bdc5aa4820 /src/dbus/qdbus_symbols_p.h | |
| parent | 38d3a7bb6eec46f1bab5ed53334ff2639e9b6eea (diff) | |
Make QtDBus compile without libdbus-1 headers, if dlopening
Most of QtDBus already needs very little from libdus-1, so create an
extra header containing the minimum API we actually need.
One large advantage of this solution is that now QtDBus can always be
enabled, even if the system doesn't have libdbus-1 installed. This is
interesting on OS X, where libdbus-1 is often installed by Homebrew or
MacPorts, which may include extra libraries we don't want in our
packaging.
Change-Id: I1b397121ec12eeca333ef778cf8e1c7b64d6b223
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/dbus/qdbus_symbols_p.h')
| -rw-r--r-- | src/dbus/qdbus_symbols_p.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h index 71658f84c6..88c51947ed 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h @@ -47,10 +47,15 @@ #define QDBUS_SYMBOLS_P_H #include <QtCore/qglobal.h> -#include <dbus/dbus.h> #ifndef QT_NO_DBUS +#ifdef QT_LINKED_LIBDBUS +# include <dbus/dbus.h> +#else +# include "dbus_minimal_p.h" +#endif + QT_BEGIN_NAMESPACE #if !defined QT_LINKED_LIBDBUS |