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/qbluetoothsocket_bluez.cpp | |
| 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/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 cfa6ef65..57071153 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> |