Browse Source

Disable UVC for iOS builds.

And fix build error…
QGC4.4
Gus Grubba 8 years ago
parent
commit
951a8f0ff7
  1. 1
      QGCCommon.pri
  2. 11
      src/comm/BluetoothLink.cc
  3. 1
      src/comm/BluetoothLink.h

1
QGCCommon.pri

@ -81,6 +81,7 @@ linux { @@ -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

11
src/comm/BluetoothLink.cc

@ -140,9 +140,6 @@ bool BluetoothLink::_hardwareConnect() @@ -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
@ -170,14 +167,6 @@ void BluetoothLink::_createSocket() @@ -170,14 +167,6 @@ void BluetoothLink::_createSocket()
}
#ifdef __ios__
void BluetoothLink::discoveryError(QBluetoothServiceDiscoveryAgent::Error error)
{
qDebug() << "Discovery error:" << error;
qDebug() << _discoveryAgent->errorString();
}
#endif
#ifdef __ios__
void BluetoothLink::serviceDiscovered(const QBluetoothServiceInfo& info)
{
if(!info.device().name().isEmpty() && !_targetSocket)

1
src/comm/BluetoothLink.h

@ -158,7 +158,6 @@ public slots: @@ -158,7 +158,6 @@ public slots:
#ifdef __ios__
void serviceDiscovered (const QBluetoothServiceInfo &info);
void discoveryFinished ();
void discoveryError (QBluetoothServiceDiscoveryAgent::Error error);
#endif
protected:

Loading…
Cancel
Save