diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-05 11:53:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-05 11:53:33 +0100 |
| commit | 7644faa881d3054e79cf886dc60080ba33dd540a (patch) | |
| tree | 37610e42031ffd3bbb6522d7c6bd9070684b8d17 /src/dbus/qdbus_symbols_p.h | |
| parent | e682ea6f782d3bb4caa4f2bd0e3be47cbe064f4f (diff) | |
| parent | 5367fa356233da4c0f28172a8f817791525f5457 (diff) | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I0cd11cbe95693b78450ea81a0187760f4a6a8b5f
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 |