From 951a8f0ff7ddffadb0860104ca00b61910ba03b8 Mon Sep 17 00:00:00 2001
From: Gus Grubba <mavlink@grubba.com>
Date: Thu, 20 Apr 2017 14:33:54 -0400
Subject: [PATCH] =?UTF-8?q?Disable=20UVC=20for=20iOS=20builds.=20And=20fix?=
 =?UTF-8?q?=20build=20error=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QGCCommon.pri             |  1 +
 src/comm/BluetoothLink.cc | 11 -----------
 src/comm/BluetoothLink.h  |  1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/QGCCommon.pri b/QGCCommon.pri
index c5dc4cb96..d600ea26c 100644
--- a/QGCCommon.pri
+++ b/QGCCommon.pri
@@ -81,6 +81,7 @@ linux {
     DEFINES += __ios__
     DEFINES += QGC_NO_GOOGLE_MAPS
     DEFINES += NO_SERIAL_LINK
+    DEFINES += QGC_DISABLE_UVC
     QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
     QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2 # Universal
     QMAKE_LFLAGS += -Wl,-no_pie
diff --git a/src/comm/BluetoothLink.cc b/src/comm/BluetoothLink.cc
index 2ffe1e725..ab78ce599 100644
--- a/src/comm/BluetoothLink.cc
+++ b/src/comm/BluetoothLink.cc
@@ -140,9 +140,6 @@ bool BluetoothLink::_hardwareConnect()
     QObject::connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::serviceDiscovered, this, &BluetoothLink::serviceDiscovered);
     QObject::connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::finished, this, &BluetoothLink::discoveryFinished);
     QObject::connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::canceled, this, &BluetoothLink::discoveryFinished);
-
-    QObject::connect(_discoveryAgent, static_cast<void (QBluetoothServiceDiscoveryAgent::*)(QBluetoothSocket::SocketError)>(&QBluetoothServiceDiscoveryAgent::error),
-            this, &BluetoothLink::discoveryError);
     _shutDown = false;
     _discoveryAgent->start();
 #else
@@ -169,14 +166,6 @@ void BluetoothLink::_createSocket()
             this, &BluetoothLink::deviceError);
 }
 
-#ifdef __ios__
-void BluetoothLink::discoveryError(QBluetoothServiceDiscoveryAgent::Error error)
-{
-    qDebug() << "Discovery error:" << error;
-    qDebug() << _discoveryAgent->errorString();
-}
-#endif
-
 #ifdef __ios__
 void BluetoothLink::serviceDiscovered(const QBluetoothServiceInfo& info)
 {
diff --git a/src/comm/BluetoothLink.h b/src/comm/BluetoothLink.h
index e639ac37d..b3407a3fd 100644
--- a/src/comm/BluetoothLink.h
+++ b/src/comm/BluetoothLink.h
@@ -158,7 +158,6 @@ public slots:
 #ifdef __ios__
     void    serviceDiscovered       (const QBluetoothServiceInfo &info);
     void    discoveryFinished       ();
-    void    discoveryError          (QBluetoothServiceDiscoveryAgent::Error error);
 #endif
 
 protected:
-- 
2.22.0