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
daff7498
Commit
daff7498
authored
Sep 16, 2016
by
Gus Grubba
Committed by
GitHub
Sep 16, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4042 from dogmaphobic/videoUpdates
Video updates for Ubuntu.
parents
4b4ece63
5f3bb056
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
qgroundcontrol.pro
qgroundcontrol.pro
+5
-0
VideoStreaming.pri
src/VideoStreaming/VideoStreaming.pri
+1
-1
No files found.
qgroundcontrol.pro
View file @
daff7498
...
...
@@ -53,6 +53,11 @@ contains (DEFINES, QGC_DISABLE_UVC) {
}
else
:
exists
(
user_config
.
pri
)
:
infile
(
user_config
.
pri
,
DEFINES
,
QGC_DISABLE_UVC
)
{
message
(
"Skipping support for UVC devices (manual override from user_config.pri)"
)
DEFINES
+=
QGC_DISABLE_UVC
}
else
:
LinuxBuild
{
contains
(
QT_VERSION
,
5.5
.
1
)
{
message
(
"Skipping support for UVC devices (conflict with Qt 5.5.1 on Ubuntu)"
)
DEFINES
+=
QGC_DISABLE_UVC
}
}
LinuxBuild
{
...
...
src/VideoStreaming/VideoStreaming.pri
View file @
daff7498
...
...
@@ -186,7 +186,7 @@ VideoEnabled {
}
LinuxBuild {
message(" You can install it using apt-get")
message(" sudo apt-get install
libgstreamer-plugins-base1.0-dev libgstreamer1.0-0:amd64 libgstreamer1.0-dev
")
message(" sudo apt-get install
gstreamer1.0*
")
}
WindowsBuild {
message(" You can download it from http://gstreamer.freedesktop.org/data/pkg/windows/")
...
...
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