diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2018-07-18 11:03:53 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2018-07-25 11:16:09 +0000 |
| commit | 28eeb7afc27e99deeb52eefe10cdd458c7621698 (patch) | |
| tree | 99d69ac21efebe315149cc9501ab5ed6ec4bfca4 /src/bluetooth/bluetooth.pro | |
| parent | 98aa6ba02628eb29cc82361fad6d2d8b18ae0488 (diff) | |
Add runtime polymorphism for QBluetoothSocketPrivate
This patch introduces a generic interface towards QBluetoothSocketPrivate.
Later on, the QBluetoothSocketPrivate class will be split into
platform specific overloads/interfaces.
Ultimately, this will be needed to support runtime selection of
the QBluetootSocket d-pointer on Linux. The Linux Bluez5 implementation is
significantly different from the Bluez4 (raw socket) implementation.
Since recent Bluez5 releases the raw socket implementation is no longer
functional and/or the user has to have root permission
and enable bluetooth --compat mode. Therefore a second QBluetoothSocket
for the dbus socket API is needed. QBLuetoothSocket has to choose at runtime
(during its instanciation) which implementation to use.
Task-number: QTBUG-68550
Change-Id: I5d0b8e24b8acd1b149b897f52f0d82eade7f3823
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Lubomir I. Ivanov <neolit123@gmail.com>
Diffstat (limited to 'src/bluetooth/bluetooth.pro')
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index ee548208..28470835 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -41,6 +41,7 @@ PRIVATE_HEADERS += \ qbluetoothdevicediscoveryagent_p.h\ qbluetoothservicediscoveryagent_p.h\ qbluetoothsocket_p.h\ + qbluetoothsocketbase_p.h \ qbluetoothserver_p.h\ qbluetoothtransferreply_p.h \ qbluetoothtransferrequest_p.h \ @@ -60,6 +61,7 @@ SOURCES += \ qbluetoothdevicediscoveryagent.cpp\ qbluetoothservicediscoveryagent.cpp\ qbluetoothsocket.cpp\ + qbluetoothsocketbase.cpp \ qbluetoothserver.cpp \ qbluetoothlocaldevice.cpp \ qbluetooth.cpp \ @@ -173,10 +175,13 @@ qtConfig(bluez) { qbluetoothtransferreply_osx_p.h \ qlowenergycontroller_osx_p.h + PRIVATE_HEADERS -= qbluetoothsocket_p.h + SOURCES -= qbluetoothdevicediscoveryagent.cpp SOURCES -= qbluetoothserviceinfo.cpp SOURCES -= qbluetoothservicediscoveryagent.cpp SOURCES -= qbluetoothsocket.cpp + SOURCES -= qbluetoothsocketbase.cpp SOURCES -= qbluetoothserver.cpp SOURCES -= qlowenergyservice_p.cpp SOURCES -= qlowenergyservice.cpp |