Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
951a8f0f
Commit
951a8f0f
authored
Apr 20, 2017
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable UVC for iOS builds.
And fix build error…
parent
fc464312
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
12 deletions
+1
-12
QGCCommon.pri
QGCCommon.pri
+1
-0
BluetoothLink.cc
src/comm/BluetoothLink.cc
+0
-11
BluetoothLink.h
src/comm/BluetoothLink.h
+0
-1
No files found.
QGCCommon.pri
View file @
951a8f0f
...
...
@@ -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
View file @
951a8f0f
...
...
@@ -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
View file @
951a8f0f
...
...
@@ -158,7 +158,6 @@ public slots:
#ifdef __ios__
void
serviceDiscovered
(
const
QBluetoothServiceInfo
&
info
);
void
discoveryFinished
();
void
discoveryError
(
QBluetoothServiceDiscoveryAgent
::
Error
error
);
#endif
protected:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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