Ticket #52203: patch-qtconn-for-10.12.diff

File patch-qtconn-for-10.12.diff, 2.2 KB (added by RJVB (René Bertin), 8 years ago)

  • qtconnectivity/src/bluetooth/osx/osxbtcentralmanager_p.h 

    From 57dfeea75bc5300d5ac75bbd4c29e754aadf8a00 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@edeltech.ch>
Date: Sun, 2 Oct 2016 21:19:39 +0200
Subject: [PATCH] Fixed build with MaxOSX10.12 SDK

This patch adds missing includes that allows to build the module with
the 10.12 SDK and Xcode 8.

Change-Id: Ieab48f6a0582b916ceecbbb9a01a4169d6ba53f5
---
 src/bluetooth/osx/osxbtcentralmanager_p.h | 8 ++++++++
 src/bluetooth/osx/osxbtledeviceinquiry.mm | 5 +++++
 src/bluetooth/osx/osxbtutility.mm         | 3 +++
 3 files changed, 16 insertions(+)

diff --git a/qtconnectivity/src/bluetooth/osx/osxbtcentralmanager_p.h b/qtconnectivity/src/bluetooth/osx/osxbtcentralmanager_p.h
index e64e5ba..81c5e8d 100644
    a b  
    6767
    6868#include "corebluetoothwrapper_p.h"
    6969
     70#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12, __IPHONE_NA)
     71#include <CoreBluetooth/CBService.h>
     72#include <CoreBluetooth/CBCharacteristic.h>
     73#include <CoreBluetooth/CBDescriptor.h>
     74#include <CoreBluetooth/CBCentralManager.h>
     75#include <CoreBluetooth/CBPeripheral.h>
     76#endif
     77
    7078@class QT_MANGLE_NAMESPACE(OSXBTCentralManager);
    7179
    7280QT_BEGIN_NAMESPACE

  • qtconnectivity/src/bluetooth/osx/osxbtledeviceinquiry.mm 

    diff --git a/qtconnectivity/src/bluetooth/osx/osxbtledeviceinquiry.mm b/qtconnectivity/src/bluetooth/osx/osxbtledeviceinquiry.mm
index 88370fa..143a12b 100644
    a b  
    4848
    4949#include "corebluetoothwrapper_p.h"
    5050
     51#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12, __IPHONE_NA)
     52#import <CoreBluetooth/CBCentralManager.h>
     53#import <CoreBluetooth/CBPeripheral.h>
     54#endif
     55
    5156QT_BEGIN_NAMESPACE
    5257
    5358namespace OSXBluetooth {

  • qtconnectivity/src/bluetooth/osx/osxbtutility.mm 

    diff --git a/qtconnectivity/src/bluetooth/osx/osxbtutility.mm b/qtconnectivity/src/bluetooth/osx/osxbtutility.mm
index ef34b63..942fed1 100644
    a b  
    4747#ifndef QT_IOS_BLUETOOTH
    4848
    4949#import <IOBluetooth/objc/IOBluetoothSDPUUID.h>
     50#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12, __IPHONE_NA)
     51#import <CoreBluetooth/CBUUID.h>
     52#endif
    5053
    5154#endif
    5255