diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-06-09 16:45:10 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-06-10 06:15:24 +0000 |
| commit | 7b4d1325ecf41ed76a5beca584702ccb5a9b5d6d (patch) | |
| tree | 120c89ffca6983b3ebff2a14ae28ff5ea5c5ec26 | |
| parent | 74916ede2ff34c2040db9cabbb5a6ee81442a7e8 (diff) | |
Bluetooth - remove duplicated class definition (iOS)
qbluetoothdevicediscoveryagent_p.cpp not needed on iOS, since
for iOS we already have iOS-specific version defined completely in the
corresponding .mm file. This is quite obvious ODR violation, but not
so obvious for compiler/linker apparently.
Change-Id: I7b7d0c9596cccea307ec7acbafbb6cd31b41d885
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 1 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 89839be1..d5a12d00 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -168,7 +168,6 @@ config_bluez:qtHaveModule(dbus) { include(osx/osxbt.pri) SOURCES += \ - qbluetoothdevicediscoveryagent_p.cpp \ qbluetoothlocaldevice_p.cpp \ qbluetoothserviceinfo_p.cpp \ qbluetoothservicediscoveryagent_p.cpp \ diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp index 81e57881..963eb368 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp @@ -36,9 +36,7 @@ #include "qbluetoothaddress.h" #include "qbluetoothuuid.h" -#ifndef QT_IOS_BLUETOOTH #include "dummy/dummy_helper_p.h" -#endif #define QT_DEVICEDISCOVERY_DEBUG @@ -52,9 +50,7 @@ QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate( q_ptr(parent) { Q_UNUSED(deviceAdapter); -#ifndef QT_IOS_BLUETOOTH printDummyWarning(); -#endif } QBluetoothDeviceDiscoveryAgentPrivate::~QBluetoothDeviceDiscoveryAgentPrivate() |