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/bluez5_helper_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/bluez5_helper_p.h')
| -rw-r--r-- | src/bluetooth/bluez/bluez5_helper_p.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/bluetooth/bluez/bluez5_helper_p.h b/src/bluetooth/bluez/bluez5_helper_p.h index 36595f9c..d8d0ef01 100644 --- a/src/bluetooth/bluez/bluez5_helper_p.h +++ b/src/bluetooth/bluez/bluez5_helper_p.h @@ -44,9 +44,12 @@ #include <QtCore/QObject> #include <QtDBus/QtDBus> -#include <bluetooth/sdp.h> #include <QtBluetooth/QBluetoothAddress> +#ifndef NO_BLUEZ_INCLUDES +#include <bluetooth/sdp.h> +#endif + typedef QMap<QString, QVariantMap> InterfaceList; typedef QMap<QDBusObjectPath, InterfaceList> ManagedObjectList; @@ -57,7 +60,10 @@ QT_BEGIN_NAMESPACE bool isBluez5(); +#ifndef NO_BLUEZ_INCLUDES QByteArray parseSdpRecord(sdp_record_t *record); +#endif + QString findAdapterForAddress(const QBluetoothAddress &wantedAddress, bool *ok); class QtBluezDiscoveryManagerPrivate; |