Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
11adc342
Commit
11adc342
authored
Jan 04, 2016
by
Tomaz Canabrava
Browse files
Fix build for Android
Signed-off-by:
Tomaz Canabrava
<
tomaz.canabrava@intel.com
>
parent
680fa638
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/comm/BluetoothLink.cc
View file @
11adc342
...
...
@@ -158,10 +158,12 @@ bool BluetoothLink::_hardwareConnect()
_discoveryAgent
=
NULL
;
}
_discoveryAgent
=
new
QBluetoothServiceDiscoveryAgent
(
this
);
connect
(
_discoveryAgent
,
&
QBluetoothServiceDiscoveryAgent
::
serviceDiscovered
,
this
,
&
BluetoothLink
::
serviceDiscovered
);
connect
(
_discoveryAgent
,
&
QBluetoothServiceDiscoveryAgent
::
finished
,
this
,
&
BluetoothLink
::
discoveryFinished
);
connect
(
_discoveryAgent
,
&
QBluetoothServiceDiscoveryAgent
::
canceled
,
this
,
&
BluetoothLink
::
discoveryFinished
);
connect
(
_discoveryAgent
,
&
QBluetoothServiceDiscoveryAgent
::
error
,
this
,
BluetoothLink
::
discoveryError
);
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
...
...
@@ -180,9 +182,12 @@ void BluetoothLink::_createSocket()
}
_targetSocket
=
new
QBluetoothSocket
(
QBluetoothServiceInfo
::
RfcommProtocol
,
this
);
QObject
::
connect
(
_targetSocket
,
&
QBluetoothSocket
::
connected
,
this
,
&
BluetoothLink
::
deviceConnected
);
QObject
::
connect
(
_targetSocket
,
&
QBluetoothSocket
::
error
,
this
,
&
BluetoothLink
::
deviceError
);
QObject
::
connect
(
_targetSocket
,
&
QBluetoothSocket
::
readyRead
,
this
,
&
BluetoothLink
::
readBytes
);
QObject
::
connect
(
_targetSocket
,
&
QBluetoothSocket
::
disconnected
,
this
,
&
BluetoothLink
::
deviceDisconnected
);
QObject
::
connect
(
_targetSocket
,
static_cast
<
void
(
QBluetoothSocket
::*
)(
QBluetoothSocket
::
SocketError
)
>
(
&
QBluetoothSocket
::
error
),
this
,
&
BluetoothLink
::
deviceError
);
}
#ifdef __ios__
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment