From 052e7ce371d4719df778ad8b378bcf1af14d294b Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Mon, 3 Oct 2016 11:22:51 +0200 Subject: CoreBluetooth - fix broken builds (macOS, iOS, tvOS, watchOS) - With recent SDK changes CoreBluetooth is not in IOBluetooth anymore. This makes corebluetoothwrapper_p.h even uglier, now we have to care about v != 10.9 && v < 10.12; v == 10.9; v >= 10.12. - Using osxbluetooth_p.h we can get rid of forward declarations (for Obj-C classes) and weird includes like - use osxbluetooth_p.h instead (and it will correctly include IOBluetooth/IOBluetooth.h etc.). Change-Id: Ia85ef2e2cc1ac7b15a58864ed25d85a0772e5c86 Reviewed-by: Alex Blasche --- src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm') diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm index 1cfe8286..18cda39b 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm @@ -39,6 +39,7 @@ #include "osx/osxbtsdpinquiry_p.h" #include "qbluetoothdeviceinfo.h" #include "osx/osxbtutility_p.h" +#include "osx/osxbluetooth_p.h" #include "osx/uistrings_p.h" #include "qbluetoothhostinfo.h" #include "qbluetoothuuid.h" @@ -52,8 +53,6 @@ #include #include -// Only after Foundation.h: -#include "osx/corebluetoothwrapper_p.h" QT_BEGIN_NAMESPACE -- cgit v1.2.3