diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-07-17 11:24:29 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-07-17 11:24:29 +0200 |
| commit | 091322bcd89e8a68ac4cd660055ffa5c270df276 (patch) | |
| tree | af20f8232f81700f2934eccd2c98d2c78d5f8b33 /src/bluetooth/bluez/objectmanager_p.h | |
| parent | b5709787c9d68108bb44f6032427db3796bbdbdd (diff) | |
| parent | 0d7c0661a538896c94a3493d9c97fca07cc526d7 (diff) | |
Merge branch '5.3' into dev
Conflicts:
src/bluetooth/bluez/bluez.pri
src/bluetooth/qbluetoothsocket_bluez.cpp
Change-Id: Ieca8f2a327bf54b42403ddab88f8b9c3ff6b4a95
Diffstat (limited to 'src/bluetooth/bluez/objectmanager_p.h')
| -rw-r--r-- | src/bluetooth/bluez/objectmanager_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/bluetooth/bluez/objectmanager_p.h b/src/bluetooth/bluez/objectmanager_p.h index 6acf3d6d..5ecde487 100644 --- a/src/bluetooth/bluez/objectmanager_p.h +++ b/src/bluetooth/bluez/objectmanager_p.h @@ -19,6 +19,11 @@ #include <QtCore/QStringList> #include <QtCore/QVariant> #include <QtDBus/QtDBus> + +/* Temporary hack to merge branches until Bluez headers are removed + * from bluez5_helpers_p.h. + */ +#define NO_BLUEZ_INCLUDES #include "bluez5_helper_p.h" /* |