Merge pull request #5030 from dogmaphobic/iOS

Disable UVC for iOS builds.

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

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)
 {

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: