diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-07-11 14:25:49 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-07-11 14:28:03 +0200 |
| commit | d20e2e84ec2edd770c830fe2c399b4c76321d187 (patch) | |
| tree | 5414ce5679dee0095a9f9dd4bca1a7e47213c919 /src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp | |
| parent | 7d4f6cab9fc5c8a8061b13e9b15bacf17e7e7b4c (diff) | |
| parent | a8a1a97b9a3f68245431a94ff670b91b340770b2 (diff) | |
Merge remote-tracking branch 'gerrit/5.6' into 5.7
Change-Id: Ifbb36469f4a325b1b783cb3b018d7793680a9055
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp index f7780722..09076d6d 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp @@ -42,9 +42,7 @@ #include "qbluetoothaddress.h" #include "qbluetoothuuid.h" -#ifndef QT_IOS_BLUETOOTH #include "dummy/dummy_helper_p.h" -#endif #define QT_DEVICEDISCOVERY_DEBUG @@ -58,9 +56,7 @@ QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate( q_ptr(parent) { Q_UNUSED(deviceAdapter); -#ifndef QT_IOS_BLUETOOTH printDummyWarning(); -#endif } QBluetoothDeviceDiscoveryAgentPrivate::~QBluetoothDeviceDiscoveryAgentPrivate() |