diff --git a/QGCCommon.pri b/QGCCommon.pri index c5dc4cb96aeab691d42fd731312f0ba0fdfac728..d600ea26cfbf28c70573496e349167a9eb05fcb8 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 2ffe1e7258637458732bf6879ffe0c7774605c94..ab78ce599cc6d44afe6795e0f5cab3e639752458 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(&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 e639ac37db98421c5a4fd7cc77a7b4ed31d558e4..b3407a3fd74a72d155f5601fce65392b72097a62 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: