diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-05 15:00:41 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-12-05 16:45:27 +0100 |
| commit | 8c0014213b97cf3bde80fbae63d5a46ad425673c (patch) | |
| tree | 4ce055a8b6f881ffdb514027b834292f3863ad69 /src/dbus/qdbus_symbols_p.h | |
| parent | c43133c81ea9abc10b42f1bd46c756167cad35d3 (diff) | |
| parent | 7644faa881d3054e79cf886dc60080ba33dd540a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into refs/staging/5.4
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 |