diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-12-01 08:34:25 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-12-01 08:34:25 +0100 |
| commit | ecf8e597a21013936ea4fe195113141bca848f9a (patch) | |
| tree | 3250cea2c4d8e8dc3bf7f55cef4b124942663d2d /src/bluetooth/qbluetoothlocaldevice_bluez.cpp | |
| parent | 56a7c671c48d42ebbedd1c5a83d3ee3301015a18 (diff) | |
| parent | 741f5e26cd618aeff349dd612516148b50c85dde (diff) | |
Merge remote-tracking branch 'gerrit/5.5' into 5.6
Change-Id: I4404df69bfdac335e9c1eb63e4ada3ba89b48b6c
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_bluez.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp index d2ec70b9..0f5d4917 100644 --- a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp @@ -656,6 +656,8 @@ QBluetoothLocalDevicePrivate::QBluetoothLocalDevicePrivate(QBluetoothLocalDevice msgConnection(0), q_ptr(q) { + registerQBluetoothLocalDeviceMetaType(); + if (isBluez5()) initializeAdapterBluez5(); else |