diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-08-13 17:07:07 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-08-13 17:07:15 +0200 |
| commit | 81b3178cede7fad5360755a1186071548d139198 (patch) | |
| tree | fd5ba8e786edaa969299be35996edc15d15cc3da /src/bluetooth/qbluetoothsocket_bluez.cpp | |
| parent | d5422ad7c9806e6a105ae9918fae650e38aad601 (diff) | |
| parent | 687c885b8625374433f4ccc8b6442ea72ea62d46 (diff) | |
Merge remote-tracking branch 'gerrit/5.4' into btle
Change-Id: I1e79c96602d0da2c2d36d6217bdfe7ff183e6df9
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_bluez.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp index b046998a..1807a225 100644 --- a/src/bluetooth/qbluetoothsocket_bluez.cpp +++ b/src/bluetooth/qbluetoothsocket_bluez.cpp @@ -45,16 +45,13 @@ #include "bluez/manager_p.h" #include "bluez/adapter_p.h" #include "bluez/device_p.h" -#include "bluez/bluez5_helper_p.h" #include "bluez/objectmanager_p.h" #include <QtBluetooth/QBluetoothLocalDevice> +#include "bluez/bluez_data_p.h" #include <qplatformdefs.h> #include <QtCore/QLoggingCategory> -#include <bluetooth/bluetooth.h> -#include <bluetooth/rfcomm.h> -#include <bluetooth/l2cap.h> #include <errno.h> #include <unistd.h> |