diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:26:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:26:47 +0100 |
| commit | a983457e2280af1a1d7f5d5b94540d5648daca18 (patch) | |
| tree | 0db99bacd423ad22fdf907fa12068aff76457218 /src/bluetooth/qbluetoothlocaldevice_p.h | |
| parent | 9a4ca9260dc92bb5e1e96c7d66639661e4ea8808 (diff) | |
| parent | d8817cebf11c9212f85a5359262d321f3c205c02 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I26c44498f63bcb2628c186e4f1a7f563460b0327
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index ca6a119b..d369a959 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.h +++ b/src/bluetooth/qbluetoothlocaldevice_p.h @@ -200,6 +200,7 @@ private: QDBusMessage msgConfirmation; QDBusConnection *msgConnection; + QString deviceAdapterPath; QBluetoothLocalDevice *q_ptr; |